Mercurial > hg
view tests/test-diff-color.out @ 9602:fc493cb90bb1
Merge with redone c655432c2c24 (issue1860)
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 16 Oct 2009 11:19:39 +0200 |
| parents | c06e7581bbaa |
| children | 9b99f158348a |
line wrap: on
line source
adding a % default context [0;1mdiff -r cf9f4ba66af2 a[0m [0;31;1m--- a/a[0m [0;32;1m+++ b/a[0m [0;35m@@ -2,7 +2,7 @@[0m c a a [0;31m-b[0m [0;32m+dd[0m a a c % --unified=2 [0;1mdiff -r cf9f4ba66af2 a[0m [0;31;1m--- a/a[0m [0;32;1m+++ b/a[0m [0;35m@@ -3,5 +3,5 @@[0m a a [0;31m-b[0m [0;32m+dd[0m a a % record [0;1mdiff --git a/a b/a[0m [0;36;1mold mode 100644[0m [0;36;1mnew mode 100755[0m 1 hunks, 2 lines changed examine changes to 'a'? [Ynsfdaq?] [0;35m@@ -2,7 +2,7 @@[0m c a a [0;31m-b[0m [0;32m+dd[0m a a c record this change to 'a'? [Ynsfdaq?]