You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: book/08-customizing-git/sections/config.asc
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -240,7 +240,7 @@ We'll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your
240
240
If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
241
241
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.
242
242
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].
244
244
Next, you'll set up external wrapper scripts to run your commands.
245
245
We'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed.
246
246
Set up a merge wrapper script named `extMerge` that calls your binary with all the arguments provided:
0 commit comments