[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] bug: double warning when marking conflict as resolved

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-10-04 17:50:27 CEST

Gerasimov, Ivan wrote:
> Hello!
>
> Suppose, you edit conflicts in TMerge. If you click "mark as
> resolved" button, and there is still an unresolved conflict, the
> warning will be shown. If you press "yes" button, the same warning
> will be shown again.
>
> The attached patch fixes this.

Thanks for the patch!
Committed in revision 7705.

Stefan 

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Oct 4 17:50:42 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.