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

diff --cc builtin/branch.c
Simple merge

diff --cc t/test-lib.sh
Simple merge