equal
deleted
inserted
replaced
7 extensions, |
7 extensions, |
8 filemerge, |
8 filemerge, |
9 ) |
9 ) |
10 |
10 |
11 def failfilemerge(filemergefn, |
11 def failfilemerge(filemergefn, |
12 premerge, repo, mynode, orig, fcd, fco, fca, labels=None): |
12 premerge, repo, wctx, mynode, orig, fcd, fco, fca, |
|
13 labels=None): |
13 raise error.Abort("^C") |
14 raise error.Abort("^C") |
14 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
15 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
15 |
16 |
16 def extsetup(ui): |
17 def extsetup(ui): |
17 extensions.wrapfunction(filemerge, '_filemerge', |
18 extensions.wrapfunction(filemerge, '_filemerge', |