mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
e36d716751
Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 lines
395 B
Text
17 lines
395 B
Text
diff_cmd () {
|
|
"$merge_tool_path" -u -e "$LOCAL" "$REMOTE"
|
|
return 0
|
|
}
|
|
|
|
merge_cmd () {
|
|
# mergetool.winmerge.trustExitCode is implicitly false.
|
|
# touch $BACKUP so that we can check_unchanged.
|
|
touch "$BACKUP"
|
|
"$merge_tool_path" -u -e -dl Local -dr Remote \
|
|
"$LOCAL" "$REMOTE" "$MERGED"
|
|
check_unchanged
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
|
|
}
|