Comments
Patch
@@ -762,7 +762,7 @@
abort: edit failed: false exited with status 1
[255]
$ hg tglog
- % 3: 63668d570d21 'C'
+ o 3: 63668d570d21 'C'
|
| @ 2: 82b8abf9c185 'D'
| |
@@ -622,7 +622,7 @@
$ hg log -GT "{rev}:{node|short} {desc}\n"
@ 4:2aa9ad1006ff B in file a
|
- | % 3:09e253b87e17 A in file a
+ | o 3:09e253b87e17 A in file a
| |
| o 2:d36c0562f908 c
| |
@@ -669,7 +669,7 @@
$ hg log -GT "{rev}:{node|short} {desc}\n"
@ 4:2aa9ad1006ff B in file a
|
- | % 3:09e253b87e17 A in file a
+ | o 3:09e253b87e17 A in file a
| |
| o 2:d36c0562f908 c
| |
@@ -712,7 +712,7 @@
$ hg log -GT "{rev}:{node|short} {desc}\n"
@ 4:2aa9ad1006ff B in file a
|
- | % 3:09e253b87e17 A in file a
+ | o 3:09e253b87e17 A in file a
| |
| o 2:d36c0562f908 c
| |
@@ -422,7 +422,7 @@
from . import mergestate as mergestatemod
mergestate = mergestatemod.mergestate.read(repo)
- if mergestate.active():
+ if mergestate.unresolvedcount():
merge_nodes = (mergestate.local, mergestate.other)
else:
merge_nodes = ()