Daniel Shahaf <[email protected]> writes: > Dag-Erling Smørgrav <[email protected]> writes: > > Please add an option to disable conflict resolution entirely. > As a hotfix, I think this will do what you need?
Thanks, I will test this later. DES -- Dag-Erling Smørgrav - [email protected]
