Documentation

- Changed 'remote' to 'second' in the merge discussion, which matches
  the term used in the paragraph.  This avoids using the loaded term
  'remote'.
This commit is contained in:
Paul Beckingham 2010-08-07 20:07:57 -04:00
parent 3bb7abf9c3
commit 6d5a03ac45

View file

@ -143,7 +143,7 @@ Exports all tasks in YAML 1.1 format.
Redirect the output to a file, if you wish to save it, or pipe it to another command. Redirect the output to a file, if you wish to save it, or pipe it to another command.
.TP .TP
.B merge path/to/remote/undo.data .B merge path/to/second/undo.data
Merges two task databases by comparing the modifications that are stored in the Merges two task databases by comparing the modifications that are stored in the
undo.data files. The location of the second undo.data file must be passed on as argument. undo.data files. The location of the second undo.data file must be passed on as argument.