Re: merge disagrees with diff
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
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
and be enlightened. -- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/
Re: merge disagrees with diff
. -- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/