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

  • Committer: John Arbash Meinel
  • Date: 2006-12-07 20:25:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2171.
  • Revision ID: john@arbash-meinel.com-20061207202500-cdhbw4uw9p60w21o
The logic for when to display 'C' for conflicts was inverted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py