diff lisp/vc/smerge-mode.el @ 109553:a4b9fa0b861b

Merge from emacs-23
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 27 Jul 2010 04:10:05 +0200
parents d928a6a7c3f2
children c77749185234 68616bb3ae25 80d61d4081a0
line wrap: on
line diff