RE: preserved-conflict-file-exts

2014-03-13 Thread Bert Huijben
> -Original Message- > From: Bert Huijben [mailto:b...@qqmail.nl] > Sent: donderdag 13 maart 2014 11:52 > To: 'Magnus Carlsson'; users@subversion.apache.org > Subject: RE: preserved-conflict-file-exts > > > -Original Message- > > From: M

RE: preserved-conflict-file-exts

2014-03-13 Thread Bert Huijben
> -Original Message- > From: Magnus Carlsson [mailto:cula...@gmail.com] > Sent: donderdag 13 maart 2014 11:02 > Subject: preserved-conflict-file-exts > > Hi, > > I have an issue with the setting: preserved-conflict-file-exts from > the subversion config fil

preserved-conflict-file-exts

2014-03-13 Thread Magnus Carlsson
Hi, I have an issue with the setting: preserved-conflict-file-exts from the subversion config file. I'm using svn 1.8.8 (r1568071) I have some files that has the extension .TcPOU I have a special compare & merge utility for these files. Unfortunately the compare & merge tool firs