Merge branch 'da/difftool'

Fix-up to a new feature in 'master'.

* da/difftool:
difftool: honor --trust-exit-code for builtin tools

diff --combined git-mergetool--lib.sh
index a40d3dfea6799e5a257dc70c82b88cacc62bdcc0,cce4f8c4945732daa0e1ca28cefb0ff4ed2fbbfc..2b6635130a6c6e80cd8d188ae611bf220d25bc0a
--- 1/git-mergetool--lib.sh
--- 2/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@@ -221,6 -221,7 +221,7 @@@ run_merge_tool () 
        else
                run_diff_cmd "$1"
        fi
+       status=$?
        return $status
  }
  
@@@ -250,7 -251,7 +251,7 @@@ list_merge_tool_candidates () 
                        tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
                fi
                tools="$tools gvimdiff diffuse diffmerge ecmerge"
 -              tools="$tools p4merge araxis bc3 codecompare"
 +              tools="$tools p4merge araxis bc codecompare"
        fi
        case "${VISUAL:-$EDITOR}" in
        *vim*)