some bug fixes

added optional trash for deleted files

changed sync behavior

merge

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

mercurial