contextual merge
From: A A <lanity_at_bk.ru>
Date: Wed, 08 Oct 2008 16:31:51 +0400
How to turn off "contextual merge" for different text files without change other behaviour? Merge must works as with binaries, but all other ("Diff" and "Edit conflicts" in TortoiseSVN) must work as with text. Some of my source files are merged incorrectly. SVN automatically sets status to "Updated" (instead "Conflicted"), and hides significant details (from left & right parts). I want to manual check and do merge process for any different text files.
SVN v1.4.5, Windows
P.S. Sorry for my bad English.
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.