t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
[git] / t / t4101 / diff.2-0
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,2 +1,2 @@
4  a
5 -b
6 \ No newline at end of file
7 +b