/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/commit.py

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py