Merge branch 'maint'
* maint: git-diff -B output fix. Fix git-am safety checks Fix duplicate xmalloc in builtin-addmaint
commit
284fe4beb6
* maint: git-diff -B output fix. Fix git-am safety checks Fix duplicate xmalloc in builtin-addmaint