Julia Evans's patch makes the 'git merge' advice in 'git status' consistent with the other conflict-producing commands. During a conflict Git already suggests --continue for rebase, revert and cherry-pick. The commit message cites 367ff69428, which says 'git merge --continue' is intended to be a synonym for 'git commit', and notes that the git merge man page already suggests it. The idea came from an earlier discussion about making this consistent.
The patch went through revisions. Phillip Wood suggested formatting the commit reference with 'git show -s --format=reference', and the wording changed to 'conclude the merge'. Evans sent a v3 after Kristoffer Haugsbakk pointed out that one change had not actually been made in an earlier version. Haugsbakk offered a 'commit --amend' snippet using 'git format-rev' to rewrite the message.
Wood said the version he looked at is good, and Junio C Hamano said he will apply the patch with Wood's Acked-by and mark the topic for 'next'.
The discussion also touched on the wording 'You have unmerged paths.' Evans agreed it could be clearer and thanked a reviewer for a note on how the implementation works. She also filed a GitGitGadget issue about a tooling problem, though the excerpts do not say what that issue concerns beyond its number.