Keyboard shortcuts

Press ← or → to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

External difftool WinMerge

Configure Winmerge as your preferred difftool:

git config --replace --global diff.tool winmerge
git config --replace --global difftool.winmerge.cmd
   "winmerge.sh \"\$LOCAL\" \"\$REMOTE\""
git config --replace --global difftool.prompt false

Save the following in c:\Users\Gabor\bin\winmerge.sh

#!/bin/sh
echo Launching WinMergeU.exe: $1 $2
"$PROGRAMFILES/WinMerge/WinMergeU.exe" -e -ub -dl "Base" -dr "Mine" "$1" "$2"