Merge branch 'tr/maint-mailinfo'

* tr/maint-mailinfo:
  mailinfo: with -b, keep space after [foo]
  am: learn passing -b to mailinfo

Conflicts:
	git-am.sh

diff --cc Documentation/git-am.txt
Simple merge

diff --cc git-am.sh
index 1c13b1399185506dd11750fe7e8c1b989a0f3d0c,8b755d93ba53e133e1bb4114b0736b5dd6f93793..64d8e2a64ddd2e6162e7a8fd93ab4294de3f161e
--- 1/git-am.sh
--- 2/git-am.sh
+++ b/git-am.sh
@@@ -571,10 -535,21 +578,15 @@@ the
  else
        utf8=-n
  fi
- if test "$(cat "$dotest/keep")" = t
- then
-       keep=-k
- fi
+ keep=$(cat "$dotest/keep")
+ case "$keep" in
+ t)
+       keep=-k ;;
+ b)
+       keep=-b ;;
+ *)
+       keep= ;;
+ esac
 -case "$(cat "$dotest/keepcr")" in
 -t)
 -      keepcr=--keep-cr ;;
 -f)
 -      keepcr=--no-keep-cr ;;
 -esac
  case "$(cat "$dotest/scissors")" in
  t)
        scissors=--scissors ;;

diff --cc t/t4150-am.sh
Simple merge