equal
deleted
inserted
replaced
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 $ echo "changed file1 different" >> file1 |
43 $ echo "changed file1 different" >> file1 |
44 |
44 |
45 $ hg update |
45 $ hg update |
46 merging file1 |
46 merging file1 |
47 warning: conflicts during merge. |
47 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
48 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
48 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
50 use 'hg resolve' to retry unresolved file merges |
49 use 'hg resolve' to retry unresolved file merges |
51 [1] |
50 [1] |
52 |
51 |
53 $ hg diff --nodates |
52 $ hg diff --nodates |