internal:merge and binary file conflicts

[Mads Kiilerich]

On 06/18/2009 12:29 PM, Matt Mackall wrote:
> @@ -153,6 +156,12 @@
>           return 0
>       if tool == "internal:fail":
>           return 1
> +    if tool == 'internal:dump':
> +        a = repo.wjoin(fd)
> +        util.copyfile(a, a + ".local")
> +        repo.wwrite(a + ".other", fco.data(), fco.flags())
> +        repo.wwrite(a + ".base", fca.data(), fca.flags())
> +        return 1 # unresolved
>    

I think it would be nice if these names were used when merge-tools are 
launched too.

The current temp location and the randomness in the names is slightly 
distracting. There is nothing in these "new" names that the merging user 
shouldn't understand, so we can expect him to feel fully comfortable 
with them.

/Mads