(smerge-context-menu-map): Remove unused var.
(smerge-keep-all): Preserve markers.
(smerge-keep-n): New fun.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-ediff): Use it.
(smerge-kill-current): Use it. Make it work on some 3-part conflicts.
(smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
(smerge-resolve): Resolve trivial 3-part conflicts.
Added context menu support in smerge mode.
Most of the part is written by Stefan Monnier.
* smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New
keyman and menu.
(smerge-text-properties): New function.
(smerge-remove-props): New function.
(smerge-popup-context-menu): New function.
(smerge-resolve): Call `smerge-remove-props'.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine):
Ditto.
(smerge-keep-current): Ditto.
(smerge-kill-current): New function.
(smerge-match-conflict): Detect the file as `a same-diff conflict'
if the filename is "ANCESTOR". Put text properties.
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
(smerge-mode): Don't assume font-lock doesn't move point.
(smerge-basic-map): Rename from smerge-basic-keymap.
Change the bindings for smerge-diff-*.
(smerge-*-map): Use easy-mmode-defmap.
(smerge-(next|prev)): Use easy-mmode-define-navigation.
(smerge-keep-*): Use smerge-auto-leave.
