##// END OF EJS Templates
resolve: run happily after conflict-free merge
Martin von Zweigbergk -
r23024:ec369694 default
parent child Browse files
Show More
@@ -5283,7 +5283,7 b' def resolve(ui, repo, *pats, **opts):'
5283 try:
5283 try:
5284 ms = mergemod.mergestate(repo)
5284 ms = mergemod.mergestate(repo)
5285
5285
5286 if not ms.active() and not show:
5286 if not (ms.active() or repo.dirstate.p2() != nullid) and not show:
5287 raise util.Abort(
5287 raise util.Abort(
5288 _('resolve command not applicable when not merging'))
5288 _('resolve command not applicable when not merging'))
5289
5289
@@ -88,16 +88,14 b' set up conflict-free merge'
88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 (branch merge, don't forget to commit)
89 (branch merge, don't forget to commit)
90
90
91 BROKEN: resolve --all should do nothing in merge without conflicts
91 resolve --all should do nothing in merge without conflicts
92 $ hg resolve --all
92 $ hg resolve --all
93 abort: resolve command not applicable when not merging
93 (no more unresolved files)
94 [255]
95
94
96 BROKEN: resolve -m should do nothing in merge without conflicts
95 resolve -m should do nothing in merge without conflicts
97
96
98 $ hg resolve -m
97 $ hg resolve -m
99 abort: resolve command not applicable when not merging
98 (no more unresolved files)
100 [255]
101
99
102 get back to conflicting state
100 get back to conflicting state
103
101
General Comments 0
You need to be logged in to leave comments. Login now