summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2009-04-08 07:17:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-08 07:25:24 (GMT)
commit21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105 (patch)
treec09c3a743b2fe74f793607c360b533f06af7d653 /.gitignore
parent9a62d72dfa833f98dd0730b3d5136f56d637a5c3 (diff)
downloadgit-21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105.zip
git-21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105.tar.gz
git-21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105.tar.bz2
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a36da9d..757c7f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,6 +80,7 @@ git-merge-recursive
git-merge-resolve
git-merge-subtree
git-mergetool
+git-mergetool--lib
git-mktag
git-mktree
git-name-rev