Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
another developer was trying to merge a change from version-1 to version-2, he too got extra changes in his merge target. -- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
block than the diff suggested, iow: svn merge tried to add more lines than svn diff said it would. -- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
and be enlightened. -- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/

Re: merge disagrees with diff

2011-10-28 Thread Flemming Frandsen
. -- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/