Mercurial > hg

annotate tests/test-update-renames.out @ 10930:230ab9a23594

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix updates - using FileSource attribute - removed unneeded "DiskId='1'" - all guids are now in guids.wxi
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 16 Apr 2010 14:57:30 +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