chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 97b0838) | patch
git-debrebase: merge: Actually record merge resolutions
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:36:59 +0000 (01:36 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:45:19 +0000 (01:45 +0100)
commit6a7d91dc81cbc8922bebc4930991902a9a00da79
tree4288d9fcab764b5b11d97dbdb888987d333a395dtree | snapshot
parent97b08388e773fb6c89817f583ea75dd0098f988acommit | 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>
git-debrebase diff | blob | history
tests/tests/gdr-merge-conflicts diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.