4 commits

Author	SHA1	Message	Date
Joey Hess	59f88558d5	doh't use "def" for command definitions, it conflicts with Data.Default.def	2014-10-14 14:20:10 -04:00
Joey Hess	b61c6bc2ff	hlint	2014-10-09 15:46:05 -04:00
Joey Hess	822f4619ae	resolvemerge: finish up by committing	2014-07-11 16:59:49 -04:00
Joey Hess	cb66ca3a76	resolvemerge: New plumbing command that runs the automatic merge conflict resolver.	2014-07-11 16:45:18 -04:00