equal
deleted
inserted
replaced
1439 if allow and linear_path: |
1439 if allow and linear_path: |
1440 raise util.Abort(_("there is nothing to merge, " |
1440 raise util.Abort(_("there is nothing to merge, " |
1441 "just use 'hg update'")) |
1441 "just use 'hg update'")) |
1442 if allow and not forcemerge: |
1442 if allow and not forcemerge: |
1443 if modified or added or removed: |
1443 if modified or added or removed: |
1444 raise util.Abort(_("outstanding uncommited changes")) |
1444 raise util.Abort(_("outstanding uncommitted changes")) |
1445 if not forcemerge and not force: |
1445 if not forcemerge and not force: |
1446 for f in unknown: |
1446 for f in unknown: |
1447 if f in m2: |
1447 if f in m2: |
1448 t1 = self.wread(f) |
1448 t1 = self.wread(f) |
1449 t2 = self.file(f).read(m2[f]) |
1449 t2 = self.file(f).read(m2[f]) |