← Back to branch summary

~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3224.1.4.

  • 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: