4 Commits

Author	SHA1	Message	Date
Edward Thomson	ccb308273a	Add git_merge_status to provide info about an upcoming merge	2014-03-20 09:25:06 -07:00
Edward Thomson	0ef19fe14c	Merge submodules	2014-01-20 18:07:17 -05:00
Edward Thomson	6b92c99bcb	Don't try to merge binary files	2014-01-20 17:15:12 -05:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00