rebase: improve error message for more than one external parent

rebase: refactor and rename checkexternal - it is a getter more than a setter

largefiles: don't prompt for normal/largefile changes when doing plain updates We used to get like: $ hg up -r 2 foo has been turned into a normal file keep as (l)argefile or use (n)ormal file? l getting changed largefiles 0 largefiles updated, 0 removed 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ cat foo cat: foo: No such file or directory [1] - which both asked the wrong question and did the wrong thing. Instead, skip this conflict resolution when the local conflicting file has been scheduled for removal and there thus is no conflict.

largefiles: remove extra check for file to get - it _is_ by definition in p2

largefiles: don't process merge actions at all when overwriting

spelling: random spell checker fixes