aboutsummaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
Commit message (Expand)AuthorAge
* merge-octopus: abort if index does not match HEADElijah Newren2016-04-12
* t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-12