~abentley/bzrtools/bzrtools.dev

361 by Aaron Bentley
Updated some bugs
1
The repo root may not contain the branch, but reconcile uses the repo
2
root, not branch.  Fix so reconcile is called properly.