workdir.c
19.5 KB
-
Remove the "merge none" flag · 0e1ba46c
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.
Edward Thomson committed