git-merge: document the -S option