diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:36:59 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:45:19 +0100 |
commit | 6a7d91dc81cbc8922bebc4930991902a9a00da79 (patch) | |
tree | 4288d9fcab764b5b11d97dbdb888987d333a395d /tests/ssh | |
parent | 97b08388e773fb6c89817f583ea75dd0098f988a (diff) |
git-debrebase: merge: Actually record merge resolutions
And, destroy it on scrap.
Nothing consumes this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/ssh')
0 files changed, 0 insertions, 0 deletions