~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/merge3.py

Committer: Martin Pool
Date: 2005-11-29 07:39:19 UTC
mto: (1185.74.1 bzr.dev (Main development branch)) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1505.1.20 bzr-bound-branch) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1518.
Revision ID: mbp@sourcefrog.net-20051129073919-f54c6a6480761588

doc

added added

removed removed

277

278

279

def reprocess_merge_regions(self, merge_regions):

280

"""Where there are conflict regions, remove the agreed lines.

281

282

Lines where both A and B have made the same changes are

283

eliminated.

284

"""

280

285

for region in merge_regions:

281

286

if region[0] != "conflict":

282

287

yield region