Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk

[git.git] / t / t4101 / diff.0-1

--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
 a
 b
+c