Bazaar Git Plugin

  1. Bug #741397
  2. Comment #2

Comment 2 for bug 741397

Revision history for this message
Andrew Bennetts (spiv) wrote :

> but we have a git repo some dirs up if that matters

Ah-hah, yes! This appears to be a bug in bzr-git's GitWorkingTree. conflicts. It returns [], but should return a ConflictsList.