summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 16:51:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 17:05:56 +0100
commit9fe91f98a08e948bf3e282cd17f7c2637669a216 (patch)
tree6cbfb60c858ef71318d39a3933c7d5f029f7ed51 /git-debrebase
parent79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd (diff)
git-debrebase: merge: test: Introduce t-merge-conflicted-*
NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
0 files changed, 0 insertions, 0 deletions