Fix "stg resolved" to work with new conflict representation

[stgit] / stgit / commands / unhide.py

diff --git a/stgit/commands/unhide.py b/stgit/commands/unhide.py
index b6a229711229fedfec1cc89070f3e174677ca85d..665d664c05f11a4ce41b915120a671c9fc52201a 100644 (file)
--- a/stgit/commands/unhide.py
+++ b/stgit/commands/unhide.py
@@ -20,6 +20,7 @@ from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
 from stgit.utils import *
 
 from stgit.commands.common import *
 from stgit.utils import *

+from stgit.out import *

 from stgit import stack, git
 
 
 from stgit import stack, git
 
 


@@ -29,6 +30,7 @@ usage = """%prog [options] <patch-range>
 Unhide a hidden range of patches so that they are shown in the plain
 'series' command output."""
 
 Unhide a hidden range of patches so that they are shown in the plain
 'series' command output."""
 

+directory = DirectoryHasRepository()

 options = [make_option('-b', '--branch',
                        help = 'use BRANCH instead of the default one')]
 
 options = [make_option('-b', '--branch',
                        help = 'use BRANCH instead of the default one')]