summaryrefslogtreecommitdiff
path: root/t/t4101/diff.3-1
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-17 17:08:36 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-17 17:08:36 -0700
commitfc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch)
tree59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /t/t4101/diff.3-1
parentMerge branch 'master' into next (diff)
parentdiff options: add --color (diff)
downloadtgif-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.xz
Merge branch 'js/diff'
Diffstat (limited to 't/t4101/diff.3-1')
-rw-r--r--t/t4101/diff.3-18
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4101/diff.3-1 b/t/t4101/diff.3-1
new file mode 100644
index 0000000000..c799c60fb9
--- /dev/null
+++ b/t/t4101/diff.3-1
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,3 @@
+ a
++b
+ c
+-b
+\ No newline at end of file