Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
[git] / t / t4101 / diff.1-0
1 --- a/frotz
2 +++ b/frotz
3 @@ -1,3 +1,2 @@
4  a
5  b
6 -c