~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3955.

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-01-23 10:31:45 UTC
  • mfrom: (3954.1.2 bzr.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090123103145-yvo3icrif75vkt20
(jam, vila) Fix an edge case with deleted files and criss-cross merges

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: