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