From 026c2608f8cf6c4916bf6a7bd497b7c3f5baf346 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 28 Apr 2011 10:35:02 +0200
Subject: Treat etc as other modules

---
 git/merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git/merge.sh')

diff --git a/git/merge.sh b/git/merge.sh
index c9ae535..4f12f8c 100755
--- a/git/merge.sh
+++ b/git/merge.sh
@@ -12,7 +12,7 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-for i in $odb_modules; do
+for i in $modules; do
   echo "merge $i" 1>&2
   cd $i
   git merge $*
-- 
cgit v1.1