summaryrefslogtreecommitdiff
path: root/t/t6060-merge-index.sh
AgeCommit message (Expand)Author
2011-04-29merge-one-file: fix broken merges with alternate work treesJeff King
2011-04-29add tests for merge-index / merge-one-fileJeff King