contrib/simplemerge
changeset 14233 659f34b833b9
parent 8269 bb9f13974d8e
child 19022 cba222f01056
equal deleted inserted replaced
14232:df2399663392 14233:659f34b833b9
    41     for first, second in out_opts:
    41     for first, second in out_opts:
    42         sys.stdout.write(' %-*s  %s\n' % (opts_len, first, second))
    42         sys.stdout.write(' %-*s  %s\n' % (opts_len, first, second))
    43 
    43 
    44 try:
    44 try:
    45     for fp in (sys.stdin, sys.stdout, sys.stderr):
    45     for fp in (sys.stdin, sys.stdout, sys.stderr):
    46         util.set_binary(fp)
    46         util.setbinary(fp)
    47     
    47     
    48     opts = {}
    48     opts = {}
    49     try:
    49     try:
    50         args = fancyopts.fancyopts(sys.argv[1:], options, opts)
    50         args = fancyopts.fancyopts(sys.argv[1:], options, opts)
    51     except fancyopts.getopt.GetoptError, e:
    51     except fancyopts.getopt.GetoptError, e: