diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-18 23:42:16 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-25 20:12:52 +0100 |
| commit | bd57c194e497ba2c327dde5400e14b573733c21a (patch) | |
| tree | 3b05f815aeeba75d234c8331ec42abe3f9a3e108 /tests/setup | |
| parent | 077ca64d7cfb771c9f4dd278a9b9e2fdb6a4f729 (diff) | |
Split brain: Make pseudomerge
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/setup')
0 files changed, 0 insertions, 0 deletions