| changeset 392 | ee4c80d294e5 |
| parent 377 | e5d769afd3ef |
| child 591 | eb46971fc57f |
| 391:5f65a108a559 | 392:ee4c80d294e5 |
|---|---|
19 resolving a |
19 resolving a |
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
21 merging a failed! |
21 merging a failed! |
22 + hg id |
22 + hg id |
23 32e80765d7fe+75234512624c+ tip |
23 32e80765d7fe+75234512624c+ tip |
24 + cat a |
24 + grep -Ev '>>>|<<<' a |
25 + grep -v '>>>' |
|
26 + grep -v '<<<' |
|
27 something else |
25 something else |
28 ======= |
26 ======= |
29 something |
27 something |
30 + hg status |
28 + hg status |
31 C a |
29 C a |