mercurial/simplemerge.py

33903:ed6f64173121

            self.ctx.write(self.text, self.ctx.flags())

    mode = opts.get('mode','merge')
    name_a, name_b, name_base = None, None, None
    if mode != 'union':
        name_a, name_b, name_base = _picklabels([localfile,
                                                 otherfile, None],
                                                opts.get('label', []))

    try:
        localtext = readctx(localctx) if localctx else readfile(localfile)
        basetext = readctx(basectx) if basectx else readfile(basefile)

33904:1915a5e809ca

            self.ctx.write(self.text, self.ctx.flags())

    mode = opts.get('mode','merge')
    name_a, name_b, name_base = None, None, None
    if mode != 'union':
        name_a, name_b, name_base = _picklabels([localctx.path(),
                                                 otherctx.path(), None],
                                                opts.get('label', []))

    try:
        localtext = readctx(localctx) if localctx else readfile(localfile)
        basetext = readctx(basectx) if basectx else readfile(basefile)