Mercurial > hg > Members > kono > nitros9-code

annotate level1/sys/merge.hp @ 3132:9bb0c42d9fc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename remaining Makefiles to makefile for consistency
author Neal Crook <foofoobedoo@gmail.com>
date Fri, 13 Jan 2017 19:52:26 +0000
parents 76b1793dbd1c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
285
5ac4920aa1f7 Added *.hp files from OS-9 Level Two, removed cmds.hp as the old OS-9 Level One
boisy
parents:
diff changeset
1 @MERGE
905
1f6c644006f1 Major overhaul, attempting documentation consistency
boisy
parents: 285
diff changeset
2 Syntax: Merge <path> [<path> [...]]
285
5ac4920aa1f7 Added *.hp files from OS-9 Level Two, removed cmds.hp as the old OS-9 Level One
boisy
parents:
diff changeset
3 Usage : Copies multiple input files to standard output
1329
76b1793dbd1c Merge now supports -z
boisy
parents: 905
diff changeset
4 Opts :
76b1793dbd1c Merge now supports -z
boisy
parents: 905
diff changeset
5 -z = get list of files from standard input
76b1793dbd1c Merge now supports -z
boisy
parents: 905
diff changeset
6