Re: Merge bug -- svn:keywords and conflict resolution

2012-05-31 Thread Julian Foad
Stefan Sperling wrote: > [moving this thread from users@ to dev@] > > On Thu, May 31, 2012 at 05:22:41PM +0200, Stefan Sperling wrote: >> On Thu, May 31, 2012 at 02:36:56PM +0100, neil.tu...@rwe.com wrote: >> > I would like to confirm this issue in v 1.6.17 - using binary files >> > via Tortoi

Re: Merge bug -- svn:keywords and conflict resolution

2012-05-31 Thread Stefan Sperling
[moving this thread from users@ to dev@] On Thu, May 31, 2012 at 05:22:41PM +0200, Stefan Sperling wrote: > On Thu, May 31, 2012 at 02:36:56PM +0100, neil.tu...@rwe.com wrote: > > I would like to confirm this issue in v 1.6.17 - using binary files > > via TortoiseSVN. Test scenario was to create