t / t4101 / diff.1-0on commit git-add: remove conflicting entry when adding. (c33ab0d)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c