aboutsummaryrefslogtreecommitdiffstats
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-25 00:21:26 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-25 00:21:26 -0700
commit18fbc94c3c00964beddeb4c415167557c16519d0 (patch)
treee321aa5d5611bba9fc5f321a505e037c66e8dbd2 /diff-lib.c
parentMerge branch 'maint' (diff)
parentt7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test (diff)
downloadgit-18fbc94c3c00964beddeb4c415167557c16519d0.tar.gz
git-18fbc94c3c00964beddeb4c415167557c16519d0.zip
Merge branch 'maint'
* maint: t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test Work around option parsing bug in the busybox tar implementation
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions