Download and install p4merge

1. P4merge Free
2. P4merge
3. P4merge Has Encountered A Problem

P4merge Free

1. Perforce P4Merge can be operated from an intuitive interface since it leaves out advanced settings to provide a clear-cut workspace for comparing text. You can get started by indicating the first.
2. The next time you do a file compare or file merge operation in Visual Studio, p4merge will be launched. The file merge operation uses 3-way merge. The left-most pane is the file on the server, the middle pane is the version you had before you made any modifications and the right-most pane is your modified version of the file.
3. The text was updated successfully, but these errors were encountered.

P4Merge is a visual diff tool that displays the differences between file versions and helps you to resolve conflicts and merge competing versions into one. This chapter includes the following topics.

My recommend way doing this is to use chocolatey installing p4merge like this: choco install p4merge -y
Alternativly you can download and install p4merge by yourself: http://www.perforce.com/perforce/downloads/index.html

Configure p4merge as merge and diff tool

You are able to configure p4merge in two ways: using the console or editing the git config file. (in your user directory ->

P4merge

.gitconfig)

P4merge Has Encountered A Problem

Run the console commands

To add p4merge as visual merge tool, run the following commands in your console. You can also edit your gitconfig file directly.
To setup p4merge as visual diff tool, run the next commands in your console. ASe before you can add the necessary lines to your local .gitconfig file by yourself.
I also added the functionality to automagically clean up my git working directoy after a conflict. You just have to run this command:

The final config file result

Run p4merge from your git bash