pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"#1474

TaoK wants to merge 1 commit intogitgitgadget:mastergitgitgadget/git:masterfrom

TaoK:tao-fetch-rebase-hintTaoK/git:tao-fetch-rebase-hintCopy head branch name to clipboard