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
..
fastforward.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
renames.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
setup.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
simple.c	Load merge.conflictstyle setting from config	2014-01-20 17:15:13 -05:00
trivial.c	Remove the "merge none" flag	2014-01-20 17:15:14 -05:00