t / t5100 / msg0001on commit git-add: remove conflicting entry when adding. (c33ab0d)
   1Here is a patch from A U Thor.
   2