summaryrefslogtreecommitdiff
path: root/t/t5100/patch0001
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/t5100/patch0001
parentMerge branch 'master' into next (diff)
parentdiff options: add --color (diff)
downloadtgif-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.xz
Merge branch 'js/diff'
Diffstat (limited to 't/t5100/patch0001')
-rw-r--r--t/t5100/patch000114
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t5100/patch0001 b/t/t5100/patch0001
new file mode 100644
index 0000000000..8ce155167d
--- /dev/null
+++ b/t/t5100/patch0001
@@ -0,0 +1,14 @@
+---
+ foo | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/foo b/foo
+index 9123cdc..918dcf8 100644
+--- a/foo
++++ b/foo
+@@ -1 +1 @@
+-Fri Jun 9 00:44:04 PDT 2006
++Fri Jun 9 00:44:13 PDT 2006
+--
+1.4.0.g6f2b
+