.edited file after merge



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?

Thanks,
Alex


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