test-lib: provide case insensitivity as a prerequisite
[git/dscho.git] / mergetools / defaults
blob1d8f2a3dd3d0370461423007ed2198918836181b
1 # Redefined by builtin tools
2 can_merge () {
3         return 0
6 can_diff () {
7         return 0
10 diff_cmd () {
11         merge_tool_cmd="$(get_merge_tool_cmd "$1")"
12         if test -z "$merge_tool_cmd"
13         then
14                 status=1
15                 break
16         fi
17         ( eval $merge_tool_cmd )
18         status=$?
19         return $status
22 merge_cmd () {
23         merge_tool_cmd="$(get_merge_tool_cmd "$1")"
24         if test -z "$merge_tool_cmd"
25         then
26                 status=1
27                 break
28         fi
29         trust_exit_code="$(git config --bool \
30                 mergetool."$1".trustExitCode || echo false)"
31         if test "$trust_exit_code" = "false"
32         then
33                 touch "$BACKUP"
34                 ( eval $merge_tool_cmd )
35                 status=$?
36                 check_unchanged
37         else
38                 ( eval $merge_tool_cmd )
39                 status=$?
40         fi
41         return $status
44 translate_merge_tool_path () {
45         echo "$1"