diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/difftool/git-difftool-helper | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper index f013726d0f..a2eb59b0f0 100755 --- a/contrib/difftool/git-difftool-helper +++ b/contrib/difftool/git-difftool-helper @@ -53,7 +53,7 @@ launch_merge_tool () { # Create and ensure that we clean up $BACKUP test -f "$MERGED" && cp -- "$MERGED" "$BACKUP" - trap sigint_handler SIGINT + trap sigint_handler INT # $LOCAL and $REMOTE are temporary files so prompt # the user with the real $MERGED name before launching $merge_tool. |