patch. Conflicts reset the patch content and a subsequent 'refresh'
will show the entire patch."""
+directory = DirectoryHasRepository()
options = [make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-p', '--patch',