Richard Hipp wrote:
On 5/7/16, Joel Bruick wrote:
This branch fixes a couple of merge tests that currently fail (marked as
"knownBug") in trunk, and the tests I've added cover every situation I
could think of to trip up the merge command. If there's anything I've
overlooked or need to improve/c
On 5/7/16, Joel Bruick wrote:
>
> This branch fixes a couple of merge tests that currently fail (marked as
> "knownBug") in trunk, and the tests I've added cover every situation I
> could think of to trip up the merge command. If there's anything I've
> overlooked or need to improve/clarify, pleas
Hi all,
In the past, there have been reports on the fossil-users mailing list
from people having problems with the merge command, almost invariably
involving renames. I actually ran into an issue with it myself before
but didn't have the time to look into it until recently.
The "merge-rename
