"merge" is used widely in xtla-1.2.
However, I think it should be "merges".
Does anyone fix this bug?
Here is an example:
(defun tla--update-command ()
(cond ((eq tla-update-strategy 'update) "update")
((eq tla-update-strategy 'merge) "merge")
((eq tla-update-strategy 'replay) "replay")))
[EMAIL PROTECTED] binareal]$ tla --version
tla [EMAIL PROTECTED]) from regexps.com
Copyright 2003 Tom Lord
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.
Report bugs to [EMAIL PROTECTED]
# automatically generated release id (by tla build-config)
#
[EMAIL PROTECTED])
./src [EMAIL PROTECTED]
./src/docs-hackerlab [EMAIL PROTECTED]
./src/docs-tla [EMAIL PROTECTED]
./src/hackerlab [EMAIL PROTECTED]
./src/tla [EMAIL PROTECTED]
[EMAIL PROTECTED] binareal]$ tla merges -H
report where two branches have been merged
usage: tla merges [options] INTO [FROM]
-h, --help Display a help message and exit.
-H Display a verbose help message and exit.
-V, --version Display a release identifier string
and exit.
-A, --archive Override `my-default-archive'
-d, --dir DIR cd to DIR first
-r, --reverse sort from newest to oldest
-f, --full print full patch level names
Print a list of pairs of patch level names:
%s %s INTO-RVN FROM-RVN
where each pair indicates that at patch level INTO-RVN of
INTO, the patch log entry FROM-RVN was added.
FROM may be a branch name, version name, or revision name.
If a branch or version name, all merges from that branch or version
are reported. If a revision name, only the merge points for that
specific revision are reported.
INTO may be a version name or revision name. If a version name,
all merge points within that version are printed. If a revision
name, all merge points at that revision or earlier are printed.
Output is sorted using patch-level ordering of the first column.
Included patches are listed by full name unless FROM is a revision
name. If FROM is a revision, --full causes its full name to be
printed.
[EMAIL PROTECTED] binareal]$ tla merge -H
tla: unrecognized command (merge)
(try 'tla help')
[EMAIL PROTECTED] binareal]$
