annotate tests/test-up-issue1456.out @ 9832:42ced358cbba

doc/style: use default font color specified by user * it's bad to specify only foreground color: http://www.w3.org/QA/Tips/color * some people prefer dark background * `color: #111' is mostly the same as `color: black', which is the default of almost all popular browsers. so it's preferable to delete `color: #111', rather than adding `background-color: white'.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 10 Nov 2009 21:48:10 +0900
parents f331de880cbb
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8855
f331de880cbb update: add --check option
Matt Mackall <mpm@selenic.com>
parents: 7630
diff changeset
1 abort: uncommitted local changes
7569
89207edf3973 correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
2 dirty
89207edf3973 correctly update dirstate after update+mode change (issue1456)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
3 M foo
7630
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
4 % validate update of standalone execute bit change
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
6 nothing changed
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
7 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973
Patrick Mezard <pmezard@gmail.com>
parents: 7569
diff changeset
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved