[PATCH] test-subrepo-git.t: update output from merge with stable

[Matt Mackall]

On Mon, 2011-03-07 at 18:47 -0500, Eric Eisner wrote:
> # HG changeset patch
> # User Eric Eisner <ede at mit.edu>
> # Date 1299541622 18000
> # Node ID a0a0d59dad8bd7cbd5904790636815ba355796ce
> # Parent  f854b775c386d3cf708663c08ca927bc25486720
> test-subrepo-git.t: update output from merge with stable
> 
> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t
> +++ b/tests/test-subrepo-git.t
> @@ -329,7 +329,7 @@ Don't crash if the subrepo is missing
>    abort: subrepo s is missing
>    [255]
>    $ hg update -C
> -  cloning subrepo s
> +  cloning subrepo s from $TESTTMP/gitroot
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg sum | grep commit
>    commit: (clean)

Looks like Patrick Mezard snuck this fix in already:

http://www.selenic.com/hg/rev/a2734c8322ac

-- 
Mathematics is the supreme nostalgia of our time.