difftool/mergetool: refactor commands to use git-mergetool--lib

diff --git a/Makefile b/Makefile
index a80055f38d8d3e080fffe0164752b5819c0379fa..3e56274d36e9ac83291554c782ac9173741ed166 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -284,6 +284,7 @@ SCRIPT_SH += git-merge-octopus.sh
 SCRIPT_SH += git-merge-one-file.sh
 SCRIPT_SH += git-merge-resolve.sh
 SCRIPT_SH += git-mergetool.sh
+SCRIPT_SH += git-mergetool--lib.sh
 SCRIPT_SH += git-parse-remote.sh
 SCRIPT_SH += git-pull.sh
 SCRIPT_SH += git-quiltimport.sh