Show More
@@ -1564,8 +1564,7 b' class localrepository(object):' | |||||
1564 | moddirstate=True, forcemerge=False, wlock=None, show_stats=True): |
|
1564 | moddirstate=True, forcemerge=False, wlock=None, show_stats=True): | |
1565 | pl = self.dirstate.parents() |
|
1565 | pl = self.dirstate.parents() | |
1566 | if not force and pl[1] != nullid: |
|
1566 | if not force and pl[1] != nullid: | |
1567 |
sel |
|
1567 | raise util.Abort(_("outstanding uncommitted merges")) | |
1568 | return 1 |
|
|||
1569 |
|
1568 | |||
1570 | err = False |
|
1569 | err = False | |
1571 |
|
1570 |
General Comments 0
You need to be logged in to leave comments.
Login now