Variable: ediff-long-help-message-merge

ediff-long-help-message-merge is a variable defined in ediff-help.el.gz.

Value

"\np,DEL -previous diff |     | -vert/horiz split   |  x -copy buf X's region to C\nn,SPC -next diff     |     h -highlighting       |  r -restore buf C's old diff\n    j -jump to diff  |     @ -auto-refinement    |  * -refine current region\n   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions\n  C-l -recenter      | #f/#h -focus/hide regions |  + -combine diff regions\n  v/V -scroll up/dn  |     X -read-only in buf X | wx -save buf X\n  </> -scroll lt/rt  |     m -wide display       | wd -save diff output\n    ~ -swap variants |     s -shrink window C    |  / -show/hide ancestor buff\n                     |  $$ -show clashes only    |  & -merge w/new default\n                     |  $* -skip changed regions |\n"

Documentation

Help message for merge sessions.

Normally, not a user option. See ediff-help-message for details.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-help.el.gz
(defconst ediff-long-help-message-merge
  "
p,DEL -previous diff |     | -vert/horiz split   |  x -copy buf X's region to C
n,SPC -next diff     |     h -highlighting       |  r -restore buf C's old diff
    j -jump to diff  |     @ -auto-refinement    |  * -refine current region
   gx -goto X's point|    ## -ignore whitespace  |  ! -update diff regions
  C-l -recenter      | #f/#h -focus/hide regions |  + -combine diff regions
  v/V -scroll up/dn  |     X -read-only in buf X | wx -save buf X
  </> -scroll lt/rt  |     m -wide display       | wd -save diff output
    ~ -swap variants |     s -shrink window C    |  / -show/hide ancestor buff
                     |  $$ -show clashes only    |  & -merge w/new default
                     |  $* -skip changed regions |
"
  "Help message for merge sessions.
Normally, not a user option.  See `ediff-help-message' for details.")