--- a/contrib/simplemerge Mon Dec 05 06:46:51 2016 +0530
+++ b/contrib/simplemerge Tue Dec 06 06:27:58 2016 +0530
@@ -3,6 +3,7 @@
from mercurial import demandimport
demandimport.enable()
+import getopt
import sys
from mercurial.i18n import _
from mercurial import error, simplemerge, fancyopts, util, ui
@@ -47,7 +48,7 @@
opts = {}
try:
args = fancyopts.fancyopts(sys.argv[1:], options, opts)
- except fancyopts.getopt.GetoptError as e:
+ except getopt.GetoptError as e:
raise ParseError(e)
if opts['help']:
showhelp()