t / t4101 / diff.1-0on commit Keep untracked files not involved in a merge. (183d797)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,3 +1,2 @@
   4 a
   5 b
   6-c