Re: [PATCHv3 1/2] add basic tests for merge-tree

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 14, 2010, 19:59 UTC
Message-ID: <7veif5ygv2.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1279127047-3273-2-git-send-email-wmpalmer@gmail.com>

Will Palmer <wmpalmer@gmail.com> writes:

Show 13 quoted lines

> merge-tree had no test cases, so here we add some very basic tests for
> it, including some known-breakages.
>
> Signed-off-by: Will Palmer <wmpalmer@gmail.com>
> ---
> diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
> new file mode 100755
> index 0000000..c02c986
> --- /dev/null
> +++ b/t/t4300-merge-tree.sh
> @@ -0,0 +1,257 @@
> ...
> +test_expect_'file add A, !B' '

Oops?

I'll queue with obvious/trivial fixups.  Thanks.