diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
commit | fc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch) | |
tree | 59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /t/t4101/diff.1-0 | |
parent | Merge branch 'master' into next (diff) | |
parent | diff options: add --color (diff) | |
download | tgif-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.xz |
Merge branch 'js/diff'
Diffstat (limited to 't/t4101/diff.1-0')
-rw-r--r-- | t/t4101/diff.1-0 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4101/diff.1-0 b/t/t4101/diff.1-0 new file mode 100644 index 0000000000..f0a2e92770 --- /dev/null +++ b/t/t4101/diff.1-0 @@ -0,0 +1,6 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a + b +-c |