t / t4101 / diff.2-0on commit Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op' (9ce2824)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6\ No newline at end of file
   7+b