3 commits

Author	SHA1	Message	Date
Joey Hess	a360437215	make automerge behavior when one side deleted explict ... This does not actually change how the merge conflict is resolved when one side deleted the file, but it was not documented before, and I think it only worked by accident. This commit was sponsored by Brett Eisenberg on Patreon.	2020-09-07 12:01:03 -04:00
Joey Hess	d5cb853dd0	expand docs	2017-06-01 11:56:56 -04:00
Joey Hess	0b029570a7	finished splitting out man pages for all commands	2015-03-25 12:09:49 -04:00