summaryrefslogtreecommitdiff
path: root/cache-tree.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-07 22:30:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-07 22:30:07 -0800
commit003b93cfb3f588284b89dc4e4c89e1046913ff59 (patch)
treeb91b59d5a1801109fba5281d5846d086eb3561d2 /cache-tree.h
parentMerge branch 'ar/sgid-bsd' (diff)
parentAdd a very basic test script for git mergetool (diff)
downloadtgif-003b93cfb3f588284b89dc4e4c89e1046913ff59.tar.xz
Merge branch 'cb/mergetool'
* cb/mergetool: Add a very basic test script for git mergetool Teach git mergetool to use custom commands defined at config time Changed an internal variable of mergetool to support custom commands Tidy up git mergetool's backup file behaviour
Diffstat (limited to 'cache-tree.h')
0 files changed, 0 insertions, 0 deletions