summaryrefslogtreecommitdiff
path: root/git/merge.sh
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-04-28 10:35:02 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-04-28 10:35:02 +0200
commit026c2608f8cf6c4916bf6a7bd497b7c3f5baf346 (patch)
tree7294d1dd9353672e1a44f074e9e9abcc9de2fcb5 /git/merge.sh
parentd2f6b7e6f7ce7725d84c4f62bb04138fa5ed7b47 (diff)
Treat etc as other modules
Diffstat (limited to 'git/merge.sh')
-rwxr-xr-xgit/merge.sh2
1 files changed, 1 insertions, 1 deletions
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 $*