git-cp: continue to merge when merge.ff is only#1070

spacewander merged 1 commit intotj:mastertj/git-extras:masterfrom

spacewander:alzspacewander/git-extras:alzCopy head branch name to clipboard