subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Kravets <kravets....@gmail.com>
Subject .edited file creation
Date Mon, 04 Jun 2012 16:10:24 GMT
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 this
file being created? I found this post (
http://svn.haxx.se/dev/archive-2008-05/0155.shtml) related to the file, but
not sure why it's created.

Thanks,
Alex

Mime
View raw message