The examples for custom merge tools refer to the command as both MERGE and DIFF3. The attached patch unifies that to use MERGE.
Cheers, James
Thanks, James. Applied your patch to trunk in r5043. Backported also to 1.7 (r5044) and 1.6 (r5045).
Log in to post a comment.
Thanks, James. Applied your patch to trunk in r5043. Backported also to 1.7 (r5044) and 1.6 (r5045).