chiark / gitweb /
Split brain: Make pseudomerge
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 18 Sep 2016 22:42:16 +0000 (23:42 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 25 Sep 2016 19:12:52 +0000 (20:12 +0100)
commitbd57c194e497ba2c327dde5400e14b573733c21a
tree3b05f815aeeba75d234c8331ec42abe3f9a3e108
parent077ca64d7cfb771c9f4dd278a9b9e2fdb6a4f729
Split brain: Make pseudomerge

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit