> t3310-notes-merge-manual-resolve.sh
>failed during a short window (due to commit 2bd811ec) and
> has already been fixed in commit 3a74ea38 ("notes: allow merging
> from arbitrary references", 29-12-2015).
Yes, it's fixed. Sorry for the noise.
The next failure is t3400.
Is there a chance to squeeze in this diff ?
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -259,11 +259,11 @@ test_expect_success 'rebase duplicated commit with
--keep-empty' '
git reset --hard &&
git checkout master &&
- >x && git add x && git commit x -mx &&
- echo x >x && git commit x -mx1 &&
+ >y && git add y && git commit y -my &&
+ echo y >y && git commit y -my1 &&
git checkout -b duplicated HEAD~ &&
- echo x >x && git commit x -mx2 &&
+ echo y >y && git commit y -my2 &&
git rebase --keep-empty master
'
>
> ATB,
> Ramsay Jones
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
