Show More
@@ -60,6 +60,22 b'' | |||||
60 | # To continue: hg commit |
|
60 | # To continue: hg commit | |
61 | # To abort: hg merge --abort |
|
61 | # To abort: hg merge --abort | |
62 |
|
62 | |||
|
63 | $ hg status -Tjson | |||
|
64 | [ | |||
|
65 | { | |||
|
66 | "path": "a", | |||
|
67 | "status": "M" | |||
|
68 | }, | |||
|
69 | { | |||
|
70 | "path": "a.orig", | |||
|
71 | "status": "?" | |||
|
72 | }, | |||
|
73 | { | |||
|
74 | "conflictsmsg": "# Unresolved merge conflicts:\n# \n# a\n# \n# To mark files as resolved: hg resolve --mark FILE\n", | |||
|
75 | "helpmsg": "# To continue: hg commit\n# To abort: hg merge --abort\n", | |||
|
76 | "statemsg": "# The repository is in an unfinished *merge* state.\n" | |||
|
77 | } | |||
|
78 | ] | |||
63 |
|
79 | |||
64 | $ cat a |
|
80 | $ cat a | |
65 | Small Mathematical Series. |
|
81 | Small Mathematical Series. |
General Comments 0
You need to be logged in to leave comments.
Login now