/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 mpdiff

  • Committer: Aaron Bentley
  • Date: 2007-04-10 17:07:59 UTC
  • mto: (2520.4.1 bzr.mpbundle) (0.9.13 temp)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070410170759-d6x4p4f8991rhzbl
Add mpdiff command for diffing multiple files to the commandline

Show diffs side-by-side

added added

removed removed

Lines of Context:
mpdiff
 
1
#!/usr/bin/env python2.4
 
2
import sys
 
3
 
 
4
from multiparent import MultiParent
 
5
 
 
6
text = open(sys.argv[1], 'rb').readlines()
 
7
parents = [open(p, 'rb').readlines() for p in sys.argv[2:]]
 
8
sys.stdout.writelines(MultiParent.from_lines(text, parents).to_patch())