Mercurial > emacs

diff oldXMenu/Activate.c @ 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 43c5da03890c
children 606f2d163a64 3765d76f7fa8
line wrap: on
line diff