Jun Wu ab6e41e651 continue: show a hint about how to resolve conflicted files ... Summary: "outstanding merge conflicts" is not a helpful message to inexperienced users. Print out commands to get more context. Reviewed By: simpkins Differential Revision: D18535010 fbshipit-source-id: 035ec9f3d79bf04a997ee907469f2e3d749a1d0e		2019-11-22 21:22:45 -08:00
..
hgdemandimport	Move fb-mercurial sources into an eden/scm subdirectory.	2019-11-13 16:04:48 -08:00
hgext	Repo converter: Allow empty author/committer fields	2019-11-22 15:38:34 -08:00
mercurial	continue: show a hint about how to resolve conflicted files	2019-11-22 21:22:45 -08:00
__init__.py	Move fb-mercurial sources into an eden/scm subdirectory.	2019-11-13 16:04:48 -08:00
traceimport.py	Move fb-mercurial sources into an eden/scm subdirectory.	2019-11-13 16:04:48 -08:00