Gaetan Semet 4075a08aec don't set merge tool in gitconfig ... Signed-off-by: Gaetan Semet <gaetan@xeberon.net>		2014-10-22 13:47:41 +02:00
..
gitconfig	don't set merge tool in gitconfig	2014-10-22 13:47:41 +02:00
gitmessage	Updated dotfile with git configuration	2013-06-10 11:37:57 +02:00