« back to all changes in this revision
Viewing changes to bzrlib/util/effbot/org/
- 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.
- files modified:
- bzrlib/tests/test_annotate.py
added
removed
bzrlib/util/effbot/org/
