gistfile1.txt

...snip...

[core]
    editor = 'C:/Program Files (x86)/ConTEXT/ConTEXT.exe'

[merge]
    keepBackup = false;
    tool = p4merge

[mergetool "p4merge"]
    cmd = 'C:/Program Files/Perforce/p4merge.exe "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
	prompt = false
    keepBackup = false
    keepTemporaries = false
    trustExitCode = false

[diff]
    tool = p4diff

[difftool "p4diff"]
	prompt = false
	cmd = 'C:/Program Files/Perforce/p4merge.exe "$LOCAL" "$REMOTE"'