store origin of file conflicts

fixes missing return in copy_file()

fixes several signedness issues

(0) -300 -100 -30 -10 -3 +3 +10 +30 +100 tip

mercurial