Re: .edited file after merge



On 2 June 2012 00:20, Alex Kravets <kravets dev gmail com> wrote:
> Hello,
>
> I am using Meld for merging svn revisions. After merge is complete, parallel
> to the file that was modified (test.txt) another file is created
> (test.txt.edited) with merge markers. Does Meld create this file? If so can
> I disable its creation? If Meld does not create this file does anybody know
> what process does?

Generally speaking, Meld doesn't create any files that you don't tell
it to. While I'm not a current svn user, I'd guess that the file is
being created by whatever svn merge-tool script you're using.

cheers,
Kai


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]