from stgit.commands.common import *
from stgit.utils import *
+from stgit.out import *
from stgit import stack, git
applied onto the specified base and a three-way merged is performed
with the current top."""
+directory = DirectoryHasRepository()
options = [make_option('-t', '--threeway',
help = 'perform a three-way merge with the current patch',
action = 'store_true'),