From 79ebbbd2607a20a79b63c0ac90fbfefe9465128b Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Tue, 1 Mar 2005 21:04:20 +0000
Subject: [PATCH] b=1987 r=phil,adilger

Convert on-disk llog to native endian as needed.
---
 build/merge1.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/merge1.sh b/build/merge1.sh
index 1fcebec1ae..d874054f1a 100755
--- 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
 
-- 
GitLab