Re: [PATCH] Fix a conflict resolut

2016-07-27 Thread Daniel Shahaf
Stefan Hett wrote on Tue, Jul 26, 2016 at 17:46:09 +0200: > (see: "code location related to investigate potential issue in resolve > dialog" thread on the TSVN user's mailing list for further details). Message-ID: http://thread.gmane.org/gmane.comp.version-control.subversion.tortoisesvn.

[PATCH] Fix a conflict resolut

2016-07-26 Thread Stefan Hett
Hi, based on the talk on IRC with stsp and Bert I'd like to propose the following patch which would resolve an issue in TSVN when selecting to prefer the local version of a binary file in conflict (see: "code location related to investigate potential issue in resolve dialog" thread on the TSV