equal
deleted
inserted
replaced
41 $ echo "* = internal:fail" >> .hg/hgrc |
41 $ echo "* = internal:fail" >> .hg/hgrc |
42 |
42 |
43 $ hg merge |
43 $ hg merge |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
45 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
45 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
46 [1] |
46 |
47 |
47 $ cat f |
48 $ cat f |
48 line 1 |
49 line 1 |
49 line 2 |
50 line 2 |
50 third line |
51 third line |