StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>From <a href="http://winmerge.org/docs/manual/CommandLine.html" rel="nofollow noreferrer">WinMerge Command line manual</a>:</p> <pre><code>cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe /ub /e \" cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe /u /e \" </code></pre> <p>(/u is the new /ub with latest WinMerge)</p> <p>might work better as a command in your mergetool section.</p> <p>However, you might have to wrap this call in a script, as described in this <a href="https://stackoverflow.com/questions/255202/how-do-i-view-git-diff-output-with-visual-diff-program/392899#392899">SO answer</a>.</p> <p>Extract adapted to <code>merge.tool</code>:</p> <blockquote> <p>Practical case for configuring <code>mergetool</code> with your custom <code>diff</code> tool:</p> </blockquote> <pre><code>C:\myGitRepo>git config --global merge.tool winmerge C:\myGitRepo>git config --global mergetool.winmerge.cmd "winmerge.sh \"$LOCAL\" \"$REMOTE\"" C:\myGitRepo>git config --global mergetool.prompt false </code></pre> <p>With <code>winmerge.sh</code> stored in a directory part of your <code>PATH</code>:</p> <pre><code>#!/bin/sh echo Launching WinMergeU.exe: $1 $2 "C:/Program Files/WinMerge/WinMergeU.exe" -e -ub "$1" "$2" </code></pre> <blockquote> <p>If you have another tool (<code>kdiff3</code>, <code>P4Diff</code>, ...), create another shell script, and the appropriate <code>mergetool.myMergeTool.cmd</code> config directive.<br> Then you can easily switch tools with the <code>merge.tool</code> config.</p> </blockquote>

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