summaryrefslogtreecommitdiff
path: root/t/t6060-merge-index.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-one-file: fix broken merges with alternate work treesJeff King2011-04-291-2/+2
* add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100