merge-recursive: leave unmerged entries in the index.
[git] / debian / git-core.files
1 /usr