summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-merge-conflicts
Commit message (Expand)AuthorAge
* git-debrebase: gdr-merge-conflicts: Call git merge --no-editIan Jackson2018-08-26
* test suite: Fix dependencies of new gdr-merge-conflicts test.debian/6.8archive/debian/6.8Ian Jackson2018-08-20
* git-debrebase: Merges: Enable with command-line option instead of env varIan Jackson2018-08-19
* git-debrebase: merge: test conflict: Test resolution via patchIan Jackson2018-08-12
* git-debrebase: merge: Actually record merge resolutionsIan Jackson2018-08-12
* git-debrebase: merge: test conflict: Break out no-wreckageIan Jackson2018-08-12
* git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/*Ian Jackson2018-08-12
* git-debrebase: merge: New record-resolved-merge subcommand, WIPIan Jackson2018-08-12
* 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