master updated (cee9a2cbe0 -> 43c0ebd8bc)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  cee9a2cbe0 Fix substitute-command-keys for global binding lookup
       new  00f6bb1286 Bind 'n'/'p' in gitmerge-mode to line scroll
       new  43c0ebd8bc * admin/gitmerge.el (gitmerge): Use 
substitute-command-keys.


Summary of changes:
 admin/gitmerge.el | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)