git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
[git] / t / t4101 / diff.3-2
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,3 +1,2 @@
4  a
5 -c
6  b
7 \ No newline at end of file