git-merge: Don't use -p when outputting summary