| changeset 45681 | a736ab681b78 |
| parent 43076 | 2372284d9457 |
| child 48426 | de8181c5414d |
| 45680:bb1a988ef4a5 | 45681:a736ab681b78 |
|---|---|
10 |
10 |
11 |
11 |
12 def failfilemerge( |
12 def failfilemerge( |
13 filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None |
13 filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None |
14 ): |
14 ): |
15 raise error.Abort("^C") |
15 raise error.Abort(b"^C") |
16 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
16 return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels) |
17 |
17 |
18 |
18 |
19 def extsetup(ui): |
19 def extsetup(ui): |
20 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) |
20 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) |