Skip to content

Instantly share code, notes, and snippets.

@bigjosh
bigjosh / Blinks Send and Receive Test
Last active September 1, 2017 18:22 — forked from jbobrow/Blinks Send and Receive Test
Quick test for latest Arduino based Blinks API
@dgoguerra
dgoguerra / p4merge-git-tool.md
Last active July 6, 2024 08:51
Setup p4merge as difftool and mergetool on Windows

Setting up p4merge as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0.

Two alternatives are explained: using the command line, and directly editing the config file.

Setting up from the command line

Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:

$ git config --global diff.tool p4merge