contrib/simplemerge
changeset 48875 6000f5b25c9b
parent 48758 7dad4665d223
equal deleted inserted replaced
48874:af0b21d5a930 48875:6000f5b25c9b
     1 #!/usr/bin/env python3
     1 #!/usr/bin/env python3
     2 from __future__ import absolute_import
       
     3 
     2 
     4 import getopt
     3 import getopt
     5 import sys
     4 import sys
     6 
     5 
     7 import hgdemandimport
     6 import hgdemandimport