chiark / gitweb /
git-debrebase: merge: Actually use merge resolutions
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:25:18 +0000 (01:25 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:45:44 +0000 (01:45 +0100)
commit63ddbee7d0c3bdfaf34cce3950c1a80fb97602c8
tree1f1e25261411913e17210287b5384bb51d954b19
parent6a7d91dc81cbc8922bebc4930991902a9a00da79
git-debrebase: merge: Actually use merge resolutions

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