Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias

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

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