t / t4101 / diff.0-2on commit git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (f91333d)
   1--- a/frotz
   2+++ b/frotz
   3@@ -1,2 +1,2 @@
   4 a
   5-b
   6+b
   7\ No newline at end of file