equal
deleted
inserted
replaced
83 sys.exit(0) |
83 sys.exit(0) |
84 if len(args) != 3: |
84 if len(args) != 3: |
85 raise ParseError(_('wrong number of arguments')) |
85 raise ParseError(_('wrong number of arguments')) |
86 local, base, other = args |
86 local, base, other = args |
87 sys.exit(simplemerge.simplemerge(uimod.ui.load(), |
87 sys.exit(simplemerge.simplemerge(uimod.ui.load(), |
88 local, |
|
89 base, |
|
90 other, |
|
91 filebackedctx(local), |
88 filebackedctx(local), |
92 filebackedctx(base), |
89 filebackedctx(base), |
93 filebackedctx(other), |
90 filebackedctx(other), |
94 filtereddata=True, |
91 filtereddata=True, |
95 **opts)) |
92 **opts)) |