[PATCH 5 of 5] merge: add more thorough tests for --force

[Pierre-Yves David]

On 12/01/2014 10:57 PM, Martin von Zweigbergk wrote:
>
>
> On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk
> <martinvonz at google.com <mailto:martinvonz at google.com>> wrote:
>
>     +# Notes:
>     +# - local didn't really change
>     content1_missing_*_content1-__tracked, so
>     +#   remote could potentially be chosen
>
>
> Mads has now addressed this issue. I have rebased locally. Let me know
> when you want me to post the rebased version.

Do you have a public repo to pull this rebased version from ?

-- 
Pierre-Yves David