chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d83b380) | patch
git-debrebase: merge: test conflict: Break out no-wreckage
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 20:57:09 +0000 (21:57 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:41:46 +0000 (01:41 +0100)
commitbab4f09f510a6af03210b40215bae6f1cf2c3179
treed87dace84c898c355b851d9e87479a2bede14bcctree | snapshot
parentd83b380941520c668a712b0b936513373bd44278commit | diff
git-debrebase: merge: test conflict: Break out no-wreckage

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge-conflicts diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.