Mercurial > emacs

diff lisp/ediff-merg.el @ 26776:142d6aa7c470

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New file. Provides a simple minor-mode for files containing diff3-style conflict markers, such as generated by RCS
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 09 Dec 1999 13:00:21 +0000
parents 3ec5a485d0ab
children 6306740f6938
line wrap: on
line diff