magit.el: introduce magit-diff-merge-diff3-separator face

Setting merge.conflictstyle to diff3 introduces a new kind of conflict
marker separator.  Give it a face of its own.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
magit.el: fix keybinding for toggle-gpgsign

6fad2b11 (introduce commit filed for GPG signature, 2013-03-17)
introduced magit-log-edit-toggle-gpgsign and bound it to "C-c C-S",
without realizing that it's equivalent to "C-c C-s", the keybinding
for magit-log-edit-toggle-signoff.  As a result, it's impossible to
toggle signoff with a keybinding now.  Fix this by changing the
keybinding for toggling gpgsign to "C-c C-v".

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Fix some typos in the manual
Merge branch 'maint'
Merge commit '8ed9895'
Merge commit 'a2bfb29'
Merge branch 'master' into next