Fixes to the pull testcases.
commit2ac49695d699a49f70bc2a899889d723797c6e12
authorYann Dirson <ydirson@altern.org>
Wed, 3 May 2006 19:34:18 +0000 (3 20:34 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 May 2006 19:34:18 +0000 (3 20:34 +0100)
tree9d50df258a75f1a58f9dc1c3b17d72d946912977
parent94d1886878f54807b7c2be9eec9410723c04f2f2
Fixes to the pull testcases.

As mentionned earlier, the original testcases do not take --merged
into account.  Let's expect the push to fail without it, and succeed
with it.

Signed-off-by: Yann Dirson <ydirson@altern.org>
t/t1201-pull-trailing.sh