git-add: no need for -f when resolving a conflict in already tracked path
[alt-git.git] / t / t4101 / diff.0-3
blobb281c43e5b5f4926e365cbd168e43420e8a4a63a
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,2 +1,3 @@
4  a
5 -b
6 +c
7 +b
8 \ No newline at end of file