~marienz/bzr-builddeb/initial-merge-upstream

Viewing all changes in revision 372.

  • Committer: James Westby
  • Date: 2009-09-11 15:07:49 UTC
  • mfrom: (370.1.2 conflicts-381303)
  • Revision ID: james.westby@canonical.com-20090911150749-iiybgidn4g3wkjxx
Refuse to build a conflicted tree.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: