]> git.wh0rd.org Git - home.git/commit
use diff3 for conflicts
authorMike Frysinger <vapier@gentoo.org>
Tue, 5 Jan 2010 19:49:38 +0000 (14:49 -0500)
committerMike Frysinger <vapier@gentoo.org>
Sat, 28 Apr 2012 19:36:34 +0000 (15:36 -0400)
commit52887a61af449802e791e1613e85726dd6825753
treed0aef728809fc7b3590d29e020f4daafe6f8e982
parentd33ba63f87f25e3f7b19b16e435192ed7cc55088
use diff3 for conflicts
.gitconfig