Consistently use MERGE when describing custom merge tools

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

Milestone: en-1.8

Status: Fixed

Owner: C. Michael Pilato

Labels: None

Priority: High

Type: Patch

Updated: 2015-08-06

Created: 2015-08-01

Private: No

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

1 Attachments

custom-merge.diff

C. Michael Pilato - 2015-08-06

Thanks, James. Applied your patch to trunk in r5043. Backported also to 1.7 (r5044) and 1.6 (r5045).

If you would like to refer to this comment somewhere else in this project, copy and paste the following link: