~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 2748.2.1.

  • Committer: Lukáš Lalinsky
  • Date: 2007-08-27 14:55:48 UTC
  • mto: (2761.1.1 tree-conflicts)
  • mto: This revision was merged to the branch mainline in revision 2762.
  • Revision ID: lalinsky@gmail.com-20070827145548-s89tzqovpyvqdp61
Return ConflictsList() instead of [] from Tree.conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: