Mercurial > emacs
view nt/install.bat @ 54527:192fc783e115
(smerge-mode-menu): Fix activate pred for resolve.
(smerge-context-menu-map): Remove unused var.
(smerge-keep-all): Preserve markers.
(smerge-keep-n): New fun.
(smerge-keep-base, smerge-keep-other, smerge-keep-mine)
(smerge-keep-current, smerge-ediff): Use it.
(smerge-kill-current): Use it. Make it work on some 3-part conflicts.
(smerge-popup-context-menu): Also use context-menu on 3-part conflicts.
(smerge-resolve): Resolve trivial 3-part conflicts.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 23 Mar 2004 19:56:42 +0000 |
parents | 93ce5f375b46 |
children | 375f2633d815 |
line wrap: on
line source
@echo off if (%1) == (speed) set BUILD_TYPE=spd if (%1) == (speed) shift if not (%1) == () set INSTALL_DIR=%1 if not (%1) == () shift nmake -f makefile.nt install %1 %2 %3 %4 %5 %6 %7 %8 %9 set INSTALL_DIR= set BUILD_TYPE= goto skipArchTag arch-tag: 1db5223b-8fc9-4bdb-8ad1-9e3962bf034a :skipArchTag