| /* Blinks Send/Receive (Test) | |
| * | |
| * -------------------------------------------------------------------------------------------------- | |
| * IMPORTANT: To use this code in Arduino's IDE, first move the Move38-Blinks folder | |
| * into the right directory i.e. <user home directory>/Documents/Arduino/hardware/Move38-Blinks | |
| * Then open the Arduino IDE and select Tools > Board > "Move38-Blinks" | |
| * Now you should be good to go :) (thanks to the hard work of Josh Levine – josh.com) | |
| * -------------------------------------------------------------------------------------------------- | |
| * | |
| * by Jonathan Bobrow |
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.
Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:
$ git config --global diff.tool p4merge