merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update

use short hashes with diff -v

Use manifest rev instead of changelog rev for linear manifest test

Removed unused imports of mdiff and templater from ui.py