> That is false. Remerge reuses the foo.THIS file, not the last-committed
> version of foo, so it preserves changes already made to the working file.
What about changes made to the working file (i.e. the file that
contains the merge with conflict markers)?
Stefan