t / t4110 / patch4.patchon commit Merge branch 'da/difftool-mergetool-simplify-reporting-status' (0ddedd4)
   1diff --git a/new.txt b/new.txt
   2--- a/new.txt
   3+++ b/new.txt
   4@@ -1,3 +1,7 @@
   5+a1
   6+a11
   7+a111
   8+a1111
   9 b1
  10 b11
  11 b111