From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 15:51:54 +0000 (+0100)
Subject: git-debrebase: merge: test: Introduce t-merge-conflicted-*
X-Git-Tag: archive/debian/6.7~105
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9fe91f98a08e948bf3e282cd17f7c2637669a216;hp=9fe91f98a08e948bf3e282cd17f7c2637669a216;p=dgit.git

git-debrebase: merge: test: Introduce t-merge-conflicted-*

NFC

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