Viewing all changes in revision 2309.4.14.
- Committer: John Arbash Meinel
- Date: 2007-03-06 15:43:47 UTC
- mto: This revision was merged to the branch mainline in revision 2321.
- Revision ID: john@arbash-meinel.com-20070306154347-ilhp9u2chs2nxm3b
The parameter is 'conflict_path' not 'conflict_file_path'
- files modified:
- bzrlib/tests/test_conflicts.py
expand all
collapse all
added
removed
