Merge branch 'master' of git://repo.or.cz/git-gui

[git/dscho.git] / t / t4101 / diff.2-1

--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
 a
-b
\ No newline at end of file
+b
+c