Re: [PATCH 1/2] mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 Thread Junio C Hamano
David Aguilar writes: > Built-in merge tools contain a hard-coded assumption about > whether or not a tool's exit code can be trusted to determine > the success or failure of a merge. Tools whose exit codes are > not trusted contain calls to check_unchanged() in their > merge_cmd() functions. >

[PATCH 1/2] mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29 Thread David Aguilar
Built-in merge tools contain a hard-coded assumption about whether or not a tool's exit code can be trusted to determine the success or failure of a merge. Tools whose exit codes are not trusted contain calls to check_unchanged() in their merge_cmd() functions. A problem with this is that the tru