diff options
Diffstat (limited to 'git/merge.sh')
-rwxr-xr-x | git/merge.sh | 2 |
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 $* |