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

Line numbering error in TMerge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-12-06 11:46:00 CET

Hi Stefan,

When resolving a conflict in TMerge with Theirs before Mine (Thomas
Borkel's example), the line numbering gets corrupted. The numbers seem
to be fairly random, and I don't think it depends on whitespace settings
this time.

Observed in r5039.

Simon

-- 
        ___
   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

TMergeConflict.png
Received on Tue Dec 6 11:45:11 2005

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.