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

TortoiseMerge: Do not set left and right view modified when using text blocks from both sides

From: ch3cooli <ch3cooli_at_yahoo.com.hk>
Date: Sun, 2 Jun 2013 05:55:00 -0700 (PDT)

1. Resolve a conflict file with TortoiseMerge
2. Use text block from 'mine' before 'theirs' or
Use text block from 'theirs' before 'mine'
3. Left and right view are set to modified state.

Expected: left and right should not set modified.
Only bottom should be set modified.

See patch

Problem exist in trunk as well as 1.7.x branch


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2013-06-02 15:59:26 CEST

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.