Mercurial > emacs

diff lisp/smerge-mode.el @ 70883:910efa724a98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict indicators.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 24 May 2006 14:25:50 +0000
parents 2b77fa42947f
children e3694f1cb928 d9f8d2a65d18 2ecafc6d5db7
line wrap: on
line diff