[bsh] 04/50: set mergeWithUpstream=1

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository bsh.

commit 986e2ebbfbe92c02f1a511d2e6c632e90b38c14d
Author: Charles Fry <cfry at debian.org>
Date:   Mon Jan 9 18:44:54 2006 +0000

    set mergeWithUpstream=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bsh.git