git-add: remove conflicting entry when adding.
[git] / Documentation / git-merge-file.txt
2006-12-16  Johannes SchindelinDocument git-merge-file