Fossil SCM

Merging the unwanted two trunk leaves.

viriketo 2011-09-01 17:45 trunk merge
Commit a22c3817578eabb91fa4b0ac6e67cdaffc748f96
1 file changed +1 -1
+1 -1
--- src/configure.c
+++ src/configure.c
@@ -726,11 +726,11 @@
726726
727727
728728
/*
729729
** COMMAND: configuration
730730
**
731
-** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY?
731
+** Usage: %fossil configuration METHOD ... ?-R|--repository REPOSITORY?
732732
**
733733
** Where METHOD is one of: export import merge pull push reset. All methods
734734
** accept the -R or --repository option to specific a repository.
735735
**
736736
** %fossil configuration export AREA FILENAME
737737
--- src/configure.c
+++ src/configure.c
@@ -726,11 +726,11 @@
726
727
728 /*
729 ** COMMAND: configuration
730 **
731 ** Usage: %fossil configure METHOD ... ?-R|--repository REPOSITORY?
732 **
733 ** Where METHOD is one of: export import merge pull push reset. All methods
734 ** accept the -R or --repository option to specific a repository.
735 **
736 ** %fossil configuration export AREA FILENAME
737
--- src/configure.c
+++ src/configure.c
@@ -726,11 +726,11 @@
726
727
728 /*
729 ** COMMAND: configuration
730 **
731 ** Usage: %fossil configuration METHOD ... ?-R|--repository REPOSITORY?
732 **
733 ** Where METHOD is one of: export import merge pull push reset. All methods
734 ** accept the -R or --repository option to specific a repository.
735 **
736 ** %fossil configuration export AREA FILENAME
737

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button