[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

comments inserted on merge

From: Brett Sturgis <bsturg21_at_gmail.com>
Date: Mon, 11 Jan 2010 18:09:54 -0800 (PST)

Whenever I merge conflicts in a file, comments such as ">>>>>mine" or others with various words and symbols are supported, and I cannot compile the file afterwards until I delete the inserted comments. Is it possible to disable the insertion of these comments when merging files?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-12 08:47:35 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.