equal
deleted
inserted
replaced
135 # Disable 3-way merge if there is only one parent |
135 # Disable 3-way merge if there is only one parent |
136 if do3way: |
136 if do3way: |
137 if node1b == nullid: |
137 if node1b == nullid: |
138 do3way = False |
138 do3way = False |
139 |
139 |
140 matcher = scmutil.match(repo, pats, opts) |
140 matcher = scmutil.match(repo[node2], pats, opts) |
141 mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3]) |
141 mod_a, add_a, rem_a = map(set, repo.status(node1a, node2, matcher)[:3]) |
142 if do3way: |
142 if do3way: |
143 mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3]) |
143 mod_b, add_b, rem_b = map(set, repo.status(node1b, node2, matcher)[:3]) |
144 else: |
144 else: |
145 mod_b, add_b, rem_b = set(), set(), set() |
145 mod_b, add_b, rem_b = set(), set(), set() |