diff options
| author | David Aguilar <davvid@gmail.com> | 2009-04-08 00:17:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 00:25:24 -0700 |
| commit | 21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105 (patch) | |
| tree | c09c3a743b2fe74f793607c360b533f06af7d653 /Makefile | |
| parent | 9a62d72dfa833f98dd0730b3d5136f56d637a5c3 (diff) | |
| download | git-21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105.tar.gz git-21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105.tar.xz | |
difftool/mergetool: refactor commands to use git-mergetool--lib
This consolidates the common functionality from git-mergetool and
git-difftool--helper into a single git-mergetool--lib scriptlet.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |