summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-merge-conflicts
Commit message (Expand)AuthorAge
* git-debrebase: merge: test gdr-merge-conflicts: Test late wreckageIan Jackson2018-08-11
* git-debrebase: merge: test gdr-merge-conflicts: Break out wreckage-*Ian Jackson2018-08-11
* git-debrebase: merge: Always save wreckageIan Jackson2018-08-11
* git-debrebase: merge: test suite: Drop check of no wreckage saveIan Jackson2018-08-11
* git-debrebase: merge: test suite: Check wreckage tidyingIan Jackson2018-08-11
* git-debrebase: merge: test suite: Check wreckage savingIan Jackson2018-08-11
* 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