chiark / gitweb /
git-debrebase: merge: gdr-merge-conflicts test: New test
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 16:01:52 +0000 (17:01 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:34:50 +0000 (18:34 +0100)
commitf8b71fe47b3216f14c31c3c2c9075ce32c0cc975
tree90de1efda8f29179a98585b0808b7a0a375fa30c
parentfad5cfbb7f5309a5f976990883d875e5d38bc000
git-debrebase: merge: gdr-merge-conflicts test: New test

Will be improved later.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/tests/control
tests/tests/gdr-merge-conflicts [new file with mode: 0755]