To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/_readdir_py.py
-
Committer:
John Arbash Meinel
-
Date:
2008-10-02 16:56:01 UTC
-
mto:
This revision was merged to the branch mainline in
revision
3763.
-
Revision ID:
john@arbash-meinel.com-20081002165601-gx13duszt9c425ec
Merge returns code 1 to indicate there were conflicts.
I didn't notice because I had an older qbzr installed which suppressed
all returncodes.
Show diffs side-by-side
added
removed