Skip to content
Snippets Groups Projects
user avatar
Siddharth Agarwal authored
Previously we'd abort the merge entirely if there was an EOF at the prompt.
This is unnecessary -- it's much better to simply fail and treat the file as
unresolved instead.
33eb8a56
History
Name Last commit Last update