summaryrefslogtreecommitdiff
path: root/t/t4101/diff.2-1
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-17 17:08:36 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-17 17:08:36 -0700
commitfc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch)
tree59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /t/t4101/diff.2-1
parentada5853c98c5c0ad84a990cc6ee7365a14555c0f (diff)
parentcd112cef999c59a7ca2a96c37b197d303a355924 (diff)
downloadgit-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.gz
Merge branch 'js/diff'
Diffstat (limited to 't/t4101/diff.2-1')
-rw-r--r--t/t4101/diff.2-18
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4101/diff.2-1 b/t/t4101/diff.2-1
new file mode 100644
index 0000000000..a66d9fd3a1
--- /dev/null
+++ b/t/t4101/diff.2-1
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,3 @@
+ a
+-b
+\ No newline at end of file
++b
++c