about summary refs log tree commit diff
path: root/third_party/git/mergetools/winmerge
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/mergetools/winmerge')
-rw-r--r--third_party/git/mergetools/winmerge15
1 files changed, 0 insertions, 15 deletions
diff --git a/third_party/git/mergetools/winmerge b/third_party/git/mergetools/winmerge
deleted file mode 100644
index 74d03259fdf1..000000000000
--- a/third_party/git/mergetools/winmerge
+++ /dev/null
@@ -1,15 +0,0 @@
-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.
-	"$merge_tool_path" -u -e -dl Local -dr Remote \
-		"$LOCAL" "$REMOTE" "$MERGED"
-}
-
-translate_merge_tool_path() {
-	mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
-}