/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/merge3.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-17 11:15:04 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7003.
  • Revision ID: jelmer@jelmer.uk-20180617111504-i2eqvqbtfj5bp0t3
s/file/open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge3.py
464
464
 
465
465
def main(argv):
466
466
    # as for diff3 and meld the syntax is "MINE BASE OTHER"
467
 
    a = file(argv[1], 'rt').readlines()
468
 
    base = file(argv[2], 'rt').readlines()
469
 
    b = file(argv[3], 'rt').readlines()
 
467
    with open(argv[1], 'rt') as f:
 
468
        a = f.readlines()
 
469
    with open(argv[2], 'rt') as f:
 
470
        base = f.readlines()
 
471
    with open(argv[3], 'rt') as f:
 
472
        b = f.readlines()
470
473
 
471
474
    m3 = Merge3(base, a, b)
472
475