equal
deleted
inserted
replaced
55 # |
55 # |
56 # a |
56 # a |
57 # |
57 # |
58 # To mark files as resolved: hg resolve --mark FILE |
58 # To mark files as resolved: hg resolve --mark FILE |
59 |
59 |
60 # To continue: hg commit |
60 # To continue: hg commit |
61 # To abort: hg update --clean . (warning: this will discard uncommitted changes) |
61 # To abort: hg update --clean . (warning: this will discard uncommitted changes) |
62 |
62 |
63 |
63 |
64 $ cat a |
64 $ cat a |
65 Small Mathematical Series. |
65 Small Mathematical Series. |
66 1 |
66 1 |