chiark / gitweb /
git-debrebase: merge: test: Introduce t-merge-conflicted-*
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 15:51:54 +0000 (16:51 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 16:05:56 +0000 (17:05 +0100)
commit9fe91f98a08e948bf3e282cd17f7c2637669a216
tree6cbfb60c858ef71318d39a3933c7d5f029f7ed51
parent79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd
git-debrebase: merge: test: Introduce t-merge-conflicted-*

NFC

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