run-command: use thread-aware die_is_recursing routine
[git/debian.git] / mergetools / defaults
blob21e63ecc3e019252c5c9ab5c26b1ea72f5952cc7
1 # Redefined by builtin tools
2 can_merge () {
3         return 0
6 can_diff () {
7         return 0
10 diff_cmd () {
11         status=1
12         return $status
15 merge_cmd () {
16         status=1
17         return $status
20 translate_merge_tool_path () {
21         echo "$1"