merge: talk about the merging state after git_merge()

Since it's not necessarily obvious, mention the merging state and how to
clear it.