| changeset 46077 | 7a2b67e6b680 |
| parent 45767 | 40411ad2f5d2 |
| child 46108 | bdc2bf68f19e |
| 46076:0e5065b6baa0 | 46077:7a2b67e6b680 |
|---|---|
78 "unfinished": "merge", |
78 "unfinished": "merge", |
79 "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort" |
79 "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort" |
80 } |
80 } |
81 ] |
81 ] |
82 |
82 |
83 $ hg status -0 |
|
84 M a\x00? a.orig\x00 (no-eol) (esc) |
|
83 $ cat a |
85 $ cat a |
84 Small Mathematical Series. |
86 Small Mathematical Series. |
85 1 |
87 1 |
86 2 |
88 2 |
87 3 |
89 3 |