summaryrefslogtreecommitdiff
path: root/tests/tests/gdr-merge
Commit message (Expand)AuthorAge
* test suite: Test dgit branch_is_gdr walker on a merge resolutionIan Jackson2018-08-25
* git-debrebase: Merges: Enable with command-line option instead of env varIan Jackson2018-08-19
* git-debrebase: merge: gdr-merge test: sort out section commentsIan Jackson2018-08-11
* git-debrebase: merge: test: Introduce t-merge-conflicted-*Ian Jackson2018-08-11
* git-debrebase: merge: test: Drop stuff cloned from gdr-viagitIan Jackson2018-08-11
* git-debrebase: merge: test suite: Use t-ref-same-startIan Jackson2018-08-11
* git-debrebase: merge: test suite: test avoiding re-merge of debian/Ian Jackson2018-08-11
* git-debrebase: merge: test suite: Do a bit more testingIan Jackson2018-08-11
* git-debrebase: merge: Comment about laundry of merge of unstitchedIan Jackson2018-08-11
* git-debrebase: merge: test suite: Test both with and without `after'Ian Jackson2018-08-11
* git-debrebase: test suite: New gdr-merge testIan Jackson2018-08-11