Mercurial > hg
view tests/test-diff-color.out @ 11148:a912f26777d3
merge: introduce tool.check parameter
tool.check is a list of check options, and can be used in place of
tool.checkchanged and tool.checkconflicts:
Equivalences:
tool.checkchanged = yes
tool.checkconflicts = no
tool.check = changed
tool.checkchanged = no
tool.checkconflicts = yes
tool.check = conflicts
tool.checkchanged = yes
tool.checkconflicts = yes
tool.check = changed, conflicts
Add _toollist() wrapper for ui.configlist() to implement this consistently.
checkchanged and checkconflicts are still supported, but check is
preferred for implementing new check options.
author | David Champion <dgc@uchicago.edu> |
---|---|
date | Mon, 10 May 2010 11:04:56 -0500 |
parents | 468876bc3885 |
children | 39e7f14a8286 |
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 % diffstat a | 2 [0;32m+[0m[0;31m-[0m 1 files changed, 1 insertions(+), 1 deletions(-) % 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?] rolling back to revision 1 (undo commit) % qrecord [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?]