3 commits

Author	SHA1	Message	Date
Jeremy Kaplan	25ea85f5a1	Fix incorrectly global git merge config	2015-11-20 23:03:15 -05:00
Jeremy Kaplan	dc5043e4d7	Update git config	2015-10-12 02:10:53 -04:00
Jeremy Kaplan	9f3dbabda9	Add git and hg configs	2015-09-05 00:05:43 -04:00