Mercurial > emacs

diff ChangeLog @ 93445:87b6e6f4a207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-apply-resolution-patch): New fun. (smerge-resolve): Add various resolution heuristics.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 Mar 2008 02:57:39 +0000
parents c598ce296aea
children 4a2fb96d5195
line wrap: on
line diff