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

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

From: Gerasimov, Ivan <Ivan.Gerasimov_at_transas.com>
Date: 2006-10-04 17:08:29 CEST

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.

Sincerely yours,
Ivan Gerasimov

---------------------------------------------------------------------
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:09:48 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.