]> git.ipfire.org Git - thirdparty/git.git/blob - mergetools/defaults
Merge branch 'jk/pickaxe-textconv' into maint
[thirdparty/git.git] / mergetools / defaults
1 # Redefined by builtin tools
2 can_merge () {
3 return 0
4 }
5
6 can_diff () {
7 return 0
8 }
9
10 diff_cmd () {
11 status=1
12 return $status
13 }
14
15 merge_cmd () {
16 status=1
17 return $status
18 }
19
20 translate_merge_tool_path () {
21 echo "$1"
22 }