equal
deleted
inserted
replaced
101 |
101 |
102 # resolve the manifest to determine which files |
102 # resolve the manifest to determine which files |
103 # we care about merging |
103 # we care about merging |
104 repo.ui.note(_("resolving manifests\n")) |
104 repo.ui.note(_("resolving manifests\n")) |
105 repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % |
105 repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % |
106 (overwrite, branchmerge, partial and True or False, linear_path)) |
106 (overwrite, branchmerge, bool(partial), linear_path)) |
107 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % |
107 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % |
108 (short(man), short(m1n), short(m2n))) |
108 (short(man), short(m1n), short(m2n))) |
109 |
109 |
110 merge = {} |
110 merge = {} |
111 get = {} |
111 get = {} |