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)
* maint-1.7.5:
test: skip clean-up when running under --immediate mode
"branch -d" can remove more than one branches

1  2 
builtin/branch.c
t/test-lib.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge