git-merge: document but discourage the historical syntax