Differences From:

File src/merge.c part of check-in [dbda8d6ce9] - Initial check-in of m1 sources. by drh on 2007-07-21 14:10:57. [view]

To:

File src/merge.c part of check-in [6607844a01] - Added options to the "timeline" CLI command. Additional help comments. by drh on 2007-08-18 11:42:24. [view]

@@ -31,15 +31,16 @@
 
 /*
 ** COMMAND: merge
 **
+** Usage: %fossil merge VERSION
+**
 ** The argument is a version that should be merged into the current
 ** checkout.
 **
 ** Only file content is merged.  The result continues to use the
 ** file and directory names from the current check-out even if those
 ** names might have been changed in the branch being merged in.
-**
 */
 void merge_cmd(void){
   int vid;              /* Current version */
   int mid;              /* Version we are merging against */