Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EB26C200B58 for ; Wed, 27 Jul 2016 16:36:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E9CCF160A90; Wed, 27 Jul 2016 14:36:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2EF84160A6F for ; Wed, 27 Jul 2016 16:36:47 +0200 (CEST) Received: (qmail 11463 invoked by uid 500); 27 Jul 2016 14:36:46 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 11452 invoked by uid 99); 27 Jul 2016 14:36:46 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jul 2016 14:36:46 +0000 Received: by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org, from userid 3316) id 256391A0187; Wed, 27 Jul 2016 14:36:46 +0000 (UTC) Date: Wed, 27 Jul 2016 14:36:45 +0000 From: Daniel Shahaf To: Stefan Hett Cc: dev@subversion.apache.org Subject: Re: [PATCH] Fix a conflict resolut Message-ID: <20160727143645.GA29234@tarsus.local2> References: <1b706ad2-bd5e-77b1-9552-6c75a38f1ce8@egosoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1b706ad2-bd5e-77b1-9552-6c75a38f1ce8@egosoft.com> User-Agent: Mutt/1.5.23 (2014-03-12) archived-at: Wed, 27 Jul 2016 14:36:48 -0000 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.user/41876