Ok, so it seems this is file with merge information that is only persisted
locally and is not made into svn during commit.
On Mon, Jun 4, 2012 at 12:10 PM, Alex Kravets wrote:
> Hello,
>
> When I am merging file from and conflict is found I merge changes by using
> either in-place editor or exte
Hello,
When I am merging file from and conflict is found I merge changes by using
either in-place editor or external visual editor (meld). Once I merge the
changes and issue 'mc' I see that the file is being created with the same
name as file that was in conflict, plus .edited append to it. Why is