Skip to content
Snippets Groups Projects
user avatar
Matt Mackall authored
Normal updates automatically clean up the resolve state, but strip
--keep does a "manual" update that bypasses the normal machinery. This
adds a mergestate reset.
69154e0a
History
Name Last commit Last update