Name |
Last commit
|
Last update |
---|---|---|
.. | ||
automerge.c | ||
commits.c | ||
modeconflict.c | ||
renames.c | ||
treediff.c | ||
trivial.c |
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.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
automerge.c | Loading commit data... | |
commits.c | Loading commit data... | |
modeconflict.c | Loading commit data... | |
renames.c | Loading commit data... | |
treediff.c | Loading commit data... | |
trivial.c | Loading commit data... |