summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2009-04-07 16:30:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-07 22:19:56 -0700
commitf92f2038a5192ac5fc1bb4f38c49906aa45b3f1e (patch)
treebe602320f21d1a232fff1d221befe8294dd78f73 /merge-tree.c
parentdifftool: move 'git-difftool' out of contrib (diff)
downloadtgif-f92f2038a5192ac5fc1bb4f38c49906aa45b3f1e.tar.xz
difftool: add various git-difftool tests
t7800-difftool.sh tests the various command-line flags, git-config variables, and environment settings supported by git-difftool. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions