equal
deleted
inserted
replaced
858 fail(f, _("file not tracked!")) |
858 fail(f, _("file not tracked!")) |
859 |
859 |
860 if (not force and not extra.get("close") and p2 == nullid |
860 if (not force and not extra.get("close") and p2 == nullid |
861 and not (changes[0] or changes[1] or changes[2]) |
861 and not (changes[0] or changes[1] or changes[2]) |
862 and self[None].branch() == self['.'].branch()): |
862 and self[None].branch() == self['.'].branch()): |
863 self.ui.status(_("nothing changed\n")) |
|
864 return None |
863 return None |
865 |
864 |
866 ms = merge_.mergestate(self) |
865 ms = merge_.mergestate(self) |
867 for f in changes[0]: |
866 for f in changes[0]: |
868 if f in ms and ms[f] == 'u': |
867 if f in ms and ms[f] == 'u': |