Edward Thomson 0e1ba46cfb Remove the "merge none" flag ... The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.		2014-01-20 17:15:14 -05:00
..
trees	Remove the "merge none" flag	2014-01-20 17:15:14 -05:00
workdir	Remove the "merge none" flag	2014-01-20 17:15:14 -05:00
merge_helpers.c	refs: remove the _with_log differentiation	2014-01-15 13:32:43 +01:00
merge_helpers.h	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00