Viewing all changes in revision 4634.101.10.
- Committer: John Arbash Meinel
- Date: 2009-12-08 20:26:23 UTC
- mto: This revision was merged to the branch mainline in revision 4889.
- Revision ID: john@arbash-meinel.com-20091208202623-p5f5du15g6zjz1wk
Add a fairly trivial test case, that shows that we drop .BASE, .THIS, and .OTHER
files when a conflict occurs. A bit surprising that I couldn't find
a similar test case elsewhere.
files when a conflict occurs. A bit surprising that I couldn't find
a similar test case elsewhere.
- files modified:
- bzrlib/tests/blackbox/test_merge.py
expand all
collapse all
added
removed
