mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
755e8b3f35
Code Compare is a commercial file comparison tool for Windows, see
http://www.devart.com/codecompare/
Version 2.80.4 added support for command line arguments preceded by a
dash instead of a slash. This is required for Git for Windows because
slashes in command line arguments get mangled with according to these
rules:
http://www.mingw.org/wiki/Posix_path_conversion
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
25 lines
387 B
Text
25 lines
387 B
Text
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
touch "$BACKUP"
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
|
|
-RF="$MERGED"
|
|
else
|
|
"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
|
|
-RF="$MERGED"
|
|
fi
|
|
check_unchanged
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
if merge_mode
|
|
then
|
|
echo CodeMerge
|
|
else
|
|
echo CodeCompare
|
|
fi
|
|
}
|