Merge branch 'jk/submodule-fsck-loose-fixup'

[git] / mergetools / guiffy

diff_cmd () {
        "$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
        if $base_present
        then
                "$merge_tool_path" -s "$LOCAL" \
                "$REMOTE" "$BASE" "$MERGED"
        else
                "$merge_tool_path" -m "$LOCAL" \
                "$REMOTE" "$MERGED"
        fi
}

exit_code_trustable () {
        true
}