Mercurial > hg

annotate tests/test-update-renames.out @ 11150:f66ca4431eb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: Reply-To support From RFC 5322: an optional reply-to field MAY also be included, which contains the field name "Reply-To" and a comma-separated list of one or more addresses. [...] When the "Reply-To:" field is present, it indicates the address(es) to which the author of the message suggests that replies be sent. In the absence of the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es) specified in the "From:" field unless otherwise specified by the person composing the reply. Reply-To addresses may be specified either via command line with --reply-to or via the 'email' or 'patchbomb' sections of the config file.
author Cédric Duval <cedricduval@free.fr>
date Mon, 10 May 2010 22:06:28 +0200
parents 4f11978ae45d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10874
4f11978ae45d copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
1 merging a and b to b
4f11978ae45d copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
2 warning: conflicts during merge.
4f11978ae45d copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
3 merging b failed!
4f11978ae45d copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
4 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
4f11978ae45d copies: properly visit file context ancestors on working file contexts
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
5 use 'hg resolve' to retry unresolved file merges