git.el: Simplify handling of merge heads in the commit log-edit buffer.
[git] / t / t4101 / diff.3-0
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,3 +1,2 @@
4  a
5 -c
6 -b
7 \ No newline at end of file
8 +b