Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 07:21:26 +0000 (00:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Oct 2009 07:21:26 +0000 (00:21 -0700)
* maint:
t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
Work around option parsing bug in the busybox tar implementation

Trivial merge