merge-one-file: fix broken merges with alternate work trees
[git/git.git] / t / t6060-merge-index.sh
2011-04-29 Jeff Kingmerge-one-file: fix broken merges with alternate work...
2011-04-29 Jeff Kingadd tests for merge-index / merge-one-file