/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 bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2008-02-18 22:19:41 UTC
  • mto: This revision was merged to the branch mainline in revision 3280.
  • Revision ID: john@arbash-meinel.com-20080218221941-emdy2iq5crf93w4i
Add a *failing* test to expose why we need better handling when a line is introduced on two sides of a merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py