~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2005-10-06 13:08:14 UTC
mfrom: (1185.12.13)
mto: (1417.1.4) (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (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 1419.
Revision ID: robertc@robertcollins.net-20051006130814-90d99eeecdb3218f

Merge Aarons conflict plugin for 0.1rc1

added added

removed removed

358

else:

359

assert(status == 1)

360

def get_lines(filename):

361

my_file = file(base, "rb")

361

my_file = file(filename, "rb")

362

lines = my_file.readlines()

363

my_file.close()

364

return lines

364

365

base_lines = get_lines(base)

365

366

other_lines = get_lines(other)

366

367

conflict_handler.merge_conflict(new_file, filename, base_lines,