Mercurial > hg > Members > kono > nitros9-code

diff level2/cmds/makefile @ 218:586168970ced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge was moved to level1/CMDS
author boisy
date Tue, 16 Jul 2002 00:46:27 +0000
parents 3572dd193d9b
children f213b599d6e2
line wrap: on
line diff
--- a/level2/cmds/makefile	Mon Jul 15 22:39:53 2002 +0000
+++ b/level2/cmds/makefile	Tue Jul 16 00:46:27 2002 +0000
@@ -18,7 +18,7 @@
 
 LEVEL1FILES	= binex.asm attr.asm build.asm date.asm deiniz.asm del.asm deldir.asm \
 		dump.asm echo.asm exbin.asm free.asm ident.asm iniz.asm inkey.asm link.asm \
-		list.asm load.asm login.asm pwd.asm pxd.asm rename.asm \
+		list.asm load.asm login.asm merge.asm pwd.asm pxd.asm rename.asm \
 		save.asm setime.asm sleep.asm tee.asm tmode.asm tsmon.asm verify.asm
 
 LEVEL2FILES	= gfx.asm mdir.asm mfree.asm montype.asm procs.asm \