From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 11 Jul 2011 07:14:47 GMT
Subject: Re: [PATCH 26/48] merge-recursive: Allow make_room_for_path() to remove D/F entries
Message-ID: <4E1AA2E7.5020301@viscovery.net>
In-Reply-To: <1307518278-23814-27-git-send-email-newren@gmail.com>

Am 6/8/2011 9:30, schrieb Elijah Newren:
> diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
> index 423fb62..dea2a65 100755
> --- a/t/t6036-recursive-corner-cases.sh
> +++ b/t/t6036-recursive-corner-cases.sh
> @@ -477,7 +477,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
>  	git tag E2
>  '
>  
> -test_expect_failure 'git detects conflict and handles merge of D & E1 correctly' '
> +test_expect_success 'git detects conflict and handles merge of D & E1 correctly' '
>  	git reset --hard &&
>  	git reset --hard &&
>  	git clean -fdqx &&

This fails on Windows, very likely for the same reason as t6020 that I
posted earlier: the message "Removing a... to make room..." is missing as
well.

-- Hannes