StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>I looked all over the internet for the answer to this. I tried all of the solutions above and elsewhere. I could get the merge part to work and not the diff part or vice versa. So what I did eventually was to hack together my own <strong>simple solution</strong> from all the info I got on the internet which works for me. It does not require any scripts only that you edit your <code>.gitconfig</code> which normally resides in the following directory <code>C:\Documents and Settings\[username]</code> You'll need to have DiffMerge program installed already.</p> <p>Here is relevant extract of my <code>.gitconfig</code> file. You'll just need to edit the path to where your version of of <code>DiffMerge</code> is. <strong>Note</strong> that I used the old DOS 8.3 format in the path</p> <pre><code>[diff] tool = diffm [difftool "diffm"] cmd = "H:/PROGRA~1/SourceGear/DiffMerge/DiffMerge.exe $LOCAL $REMOTE" prompt = false [merge] tool = diffmerge [mergetool "diffmerge"] cmd = "H:/PROGRA~1/SourceGear/DiffMerge/DiffMerge.exe --merge --result=$MERGED $LOCAL $BASE $REMOTE" trustExitCode = false keepBackup = false </code></pre> <p>You can also set it up using the commands <code>git config --replace --global [options]</code> if you so wish. </p> <hr> <p>This simple solution works perfectly for me, too. For more recent versions of DiffMerge (3.3.1), the command path needs to be changed:</p> <pre><code> cmd = "C:/PROGRA~1/SourceGear/Common/DiffMerge/sgdm.exe ...etc..." </code></pre>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload