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)
commit18fbc94c3c00964beddeb4c415167557c16519d0
treee321aa5d5611bba9fc5f321a505e037c66e8dbd2
parent02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac
parent3319df6f3aa3271124847e2c91c7e6d0be961bc6
Merge branch 'maint'

* maint:
  t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test
  Work around option parsing bug in the busybox tar implementation