Re: [fossil-users] merging and file names: help text is wrong and conflicts are not reported

On Sun, Jul 28, 2013 at 4:19 AM, Eric Rubin-Smith eas@gmail.com wrote: [1] http://www.fossil-scm.org/index.html/tktview?name=67176c3aa4 Thanks - tested and closed (not reproducible). i cannot say anything sensible to your other points, so i'll maintain a tactical silence on them :). --

[fossil-users] merging and file names: help text is wrong and conflicts are not reported

From 'fossil help merge': === Only file content is merged. The result continues to use the file and directory names from the current checkout even if those names might have been changed in the branch being merged in. === This struck me as very odd. If the file name only changed on the branch