Mercurial > hg-stable
diff contrib/import-checker.py @ 26898:33eb8a56d0c9
filemerge: treat EOF at prompt as fail, not abort
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.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 10 Nov 2015 17:13:16 -0800 |
parents | 1aee2ab0f902 |
children | f804bf27439b |