gitconifg: diff3

Signed-off-by: Adrian-Tudor Panescu <adrian@panescu.com>