view tests/test-diff-color.out @ 7802:dd970a311ea8

merge with stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sun, 25 Jan 2009 19:15:49 +0100
parents 3fb5c142a9f0
children c06e7581bbaa
line wrap: on
line source

adding a
% default context
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
 c
 a
 a
-b
+dd
 a
 a
 c
% --unified=2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
 a
 a
-b
+dd
 a
 a