Merge branch 'maint-1.7.5' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Jun 2011 23:41:55 +0000 (16:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Jun 2011 23:41:55 +0000 (16:41 -0700)
commitf5cfd52f7b85d693b3782297819981a502a0135b
tree18ee132a84ab97f275a35b595b6a713611861f6f
parentf696543dad6c7ba27b0c4fab167a5687263a9ba0
parentb586744a864cf4d6886d6436d559302123b01fae
Merge branch 'maint-1.7.5' into maint

* maint-1.7.5:
  test: skip clean-up when running under --immediate mode
  "branch -d" can remove more than one branches
builtin/branch.c
t/test-lib.sh