Mercurial > emacs

comparison lisp/vc/smerge-mode.el @ 111012:2b6e7f137773

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the MSDOS build broken by last revisions. msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands. Needed because of changes in revno 101897. msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms. Needed because of changes in revno 101876. src/unexcoff.c (make_hdr): Fix prototype according to changes in revno 101757.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 15 Oct 2010 20:45:12 +0200
parents d928a6a7c3f2
children c77749185234 68616bb3ae25 80d61d4081a0
comparison
equal deleted inserted replaced
111010:f87c1553c94e 111012:2b6e7f137773