Mercurial > hg
view tests/test-diff-color.out @ 7954:b969611064ae
rebase: don't lose rename/copy data (Issue1423)
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Mon, 30 Mar 2009 18:26:32 +0200 |
| parents | 3fb5c142a9f0 |
| children | c06e7581bbaa |
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