From: Junio C Hamano Date: Sun, 25 Oct 2009 07:21:26 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.6.6-rc0~105 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18fbc94c3c00964beddeb4c415167557c16519d0;p=git.git Merge branch 'maint' * maint: t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test Work around option parsing bug in the busybox tar implementation --- 18fbc94c3c00964beddeb4c415167557c16519d0