[jmock] 02/02: set mergeWithUpstream=1

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/RELEASE_1_0_1-2
in repository jmock.

commit c6c03392479706e1644ff14c67f0c3e6819a354b
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/jmock.git