summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-merge-conflicts
Commit message (Expand)AuthorAge
* git-debrebase: merge: gdr-merge test: Test an early failure tooIan Jackson2018-08-11
* git-debrebase: merge: gdr-merge-conflicts test: New testIan Jackson2018-08-11