Skip to content

Commit 46addad

Browse files
committed
Merge pull request #461 from al-the-x/correct-p4merge-link
Correct P4Merge link in "External Merge and Diff Tools"
2 parents 0eb96c7 + 1c17f16 commit 46addad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/08-customizing-git/sections/config.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ We'll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your
240240
If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
241241
We'll use path names in the examples that work on Mac and Linux systems; for Windows, you'll have to change `/usr/local/bin` to an executable path in your environment.
242242

243-
To begin, download P4Merge from http://www.perforce.com/downloads/Perforce/[].
243+
To begin, https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools[download P4Merge from Perforce].
244244
Next, you'll set up external wrapper scripts to run your commands.
245245
We'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed.
246246
Set up a merge wrapper script named `extMerge` that calls your binary with all the arguments provided:

0 commit comments

Comments
 (0)