commit-reach: implement get_reachable_subset
[git.git] / mergetools / guiffy
blob8b23a13c4111bdecc700a4a1a4547e15760eba58
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
5 merge_cmd () {
6         if $base_present
7         then
8                 "$merge_tool_path" -s "$LOCAL" \
9                 "$REMOTE" "$BASE" "$MERGED"
10         else
11                 "$merge_tool_path" -m "$LOCAL" \
12                 "$REMOTE" "$MERGED"
13         fi
16 exit_code_trustable () {
17         true