equal
deleted
inserted
replaced
42 [1] |
42 [1] |
43 |
43 |
44 $ hg id |
44 $ hg id |
45 618808747361+c0c68e4fe667+ tip |
45 618808747361+c0c68e4fe667+ tip |
46 |
46 |
|
47 $ echo "[commands]" >> $HGRCPATH |
|
48 $ echo "status.verbose=true" >> $HGRCPATH |
|
49 $ hg status |
|
50 M a |
|
51 ? a.orig |
|
52 # The repository is in an unfinished *merge* state. |
|
53 |
|
54 # Unresolved merge conflicts: |
|
55 # |
|
56 # a |
|
57 # |
|
58 # To mark files as resolved: hg resolve --mark FILE |
|
59 |
|
60 # To continue: hg commit |
|
61 # To abort: hg update --clean . (warning: this will discard uncommitted changes) |
|
62 |
|
63 |
47 $ cat a |
64 $ cat a |
48 Small Mathematical Series. |
65 Small Mathematical Series. |
49 1 |
66 1 |
50 2 |
67 2 |
51 3 |
68 3 |
56 4 |
73 4 |
57 5 |
74 5 |
58 >>>>>>> merge rev: c0c68e4fe667 - test: branch1 |
75 >>>>>>> merge rev: c0c68e4fe667 - test: branch1 |
59 Hop we are done. |
76 Hop we are done. |
60 |
77 |
61 $ hg status |
78 $ hg status --config commands.status.verbose=0 |
62 M a |
79 M a |
63 ? a.orig |
80 ? a.orig |
64 |
81 |
65 Verify custom conflict markers |
82 Verify custom conflict markers |
66 |
83 |