Re: [PATCH] Fix a conflict resolution issue related to binary files (patch v2)

2016-08-06 Thread Stefan
On 7/26/2016 17:58, Stefan Hett wrote: > On 7/26/2016 5:46 PM, Stefan Hett wrote: >> 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

Re: [PATCH] Fix a conflict resolution issue related to binary files (patch v2)

2016-07-26 Thread Stefan Hett
On 7/26/2016 5:46 PM, Stefan Hett wrote: 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