Refactor merge code Delete old code Fix calculation of newer nodes on server Fix branch recursion on client Fix manifest merge problems Add more debugging and note messages to merge

include hg
recursive-include mercurial *.py
include tkmerge
include *.txt
include README