mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
7e4bf67e6a
On Windows the bcompare tool launches a graphical program and does not wait for it to terminate. A separate 'bcomp' tool is provided which will wait for the view to exit so we use this instead. Reported-by: Werner BEROUX <werner@beroux.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
28 lines
398 B
Plaintext
28 lines
398 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
touch "$BACKUP"
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
|
|
-mergeoutput="$MERGED"
|
|
else
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE" \
|
|
-mergeoutput="$MERGED"
|
|
fi
|
|
check_unchanged
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
case $(uname -s) in
|
|
*MINGW*)
|
|
echo bcomp
|
|
;;
|
|
*)
|
|
echo bcompare
|
|
;;
|
|
esac
|
|
}
|