summaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
Commit message (Expand)AuthorAgeFilesLines
* 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