b=1987

r=phil,adilger

Convert on-disk llog to native endian as needed.

diff --git a/build/merge1.sh b/build/merge1.sh
index 1fcebec..d874054 100755 (executable)
--- a/build/merge1.sh
+++ b/build/merge1.sh
@@ -14,7 +14,7 @@ if [ -f $CONFLICTS ] ; then
 fi
 
 if [ $# -lt 2 -o $# -gt 3 ]; then
-    echo "This is phase 1 of merging branches. Usage: $0 parent child [dir]"
+    echo "This is phase 1 of merging branches. Usage: $0 parent child dir"
     exit
 fi