| changeset 48432 | f45a4a47f6a8 |
| parent 48426 | de8181c5414d |
| child 48875 | 6000f5b25c9b |
| 48431:6b1049d71c3e | 48432:f45a4a47f6a8 |
|---|---|
12 def failfilemerge(*args, **kwargs): |
12 def failfilemerge(*args, **kwargs): |
13 raise error.Abort(b"^C") |
13 raise error.Abort(b"^C") |
14 |
14 |
15 |
15 |
16 def extsetup(ui): |
16 def extsetup(ui): |
17 extensions.wrapfunction(filemerge, '_filemerge', failfilemerge) |
17 extensions.wrapfunction(filemerge, 'filemerge', failfilemerge) |