summaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-221-1/+1
* t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-221-5/+21
* Merge branch 'js/t6044-use-test-seq'Junio C Hamano2016-05-291-2/+2
|\
| * t6044: replace seq by test_seqjs/t6044-use-test-seqJohannes Sixt2016-05-181-2/+2
* | merge-octopus: abort if index does not match HEADen/merge-octopus-fixElijah Newren2016-04-121-3/+3
|/
* t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-121-0/+153