chiark / gitweb /
git-debrebase: merge: gdr-merge test: Test an early failure too
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 16:31:01 +0000 (17:31 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:09:02 +0000 (20:09 +0100)
commit0c08383390e6759b14a8a825c736abd5ec555e0a
tree7cfec65c66fb1b250aedaa8d2f85fb7c32973575
parent066a68f06bfb3f17b31ff7244e21a00ddd6d48bb
git-debrebase: merge: gdr-merge test: Test an early failure too

And sort out the section comments.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge-conflicts