![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 8 Apr 2009 07:17:20 +0000 (00:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 07:25:24 +0000 (00:25 -0700) | ||
| commit | 21d0ba7ebb0c6b6c6ad844f8a40fff8dd4c0b105 | |
| tree | c09c3a743b2fe74f793607c360b533f06af7d653 | tree | snapshot |
| parent | 9a62d72dfa833f98dd0730b3d5136f56d637a5c3 | commit | diff |
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>
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>
| .gitignore | diff | blob | history | |
| Documentation/git-mergetool--lib.txt | [new file with mode: 0644] | blob |
| Makefile | diff | blob | history | |
| git-difftool--helper.sh | diff | blob | history | |
| git-mergetool--lib.sh | [new file with mode: 0644] | blob |
| git-mergetool.sh | diff | blob | history |