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

Small Bug in TortoiseMerge

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2006-08-30 12:13:58 CEST

Hi Folks,

A display bug in build 7351 - 32 Bit

If the last line (block) in a file is conflicted, the "Use mine before
theirs" or "Use theirs before mine" will operate correctly, which can be
confirmed after the file has been saved.

But you cannot scroll down to the lines that have been appended and see them
(you only get to see the lines inserted "before"), which gives you the
impression that the action has failed.

Cheers
- Lübbe

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 30 12:14:09 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.