--- a/components/mercurial/mercurial-GENFRAG.p5m	Wed Jul 02 14:04:37 2014 -0700
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Wed Jun 11 10:40:29 2014 -0700
@@ -37,6 +37,7 @@
 file path=usr/demo/mercurial/debugcmdserver.py mode=555
 file path=usr/demo/mercurial/debugshell.py
 file path=usr/demo/mercurial/dumprevlog mode=555
+file path=usr/demo/mercurial/editmerge mode=555
 file path=usr/demo/mercurial/hg-ssh mode=555
 file path=usr/demo/mercurial/hgk mode=555
 file path=usr/demo/mercurial/hgsh/Makefile
@@ -57,7 +58,6 @@
 file path=usr/demo/mercurial/synthrepo.py
 file path=usr/demo/mercurial/tcsh_completion
 file path=usr/demo/mercurial/tcsh_completion_build.sh mode=555
-file path=usr/demo/mercurial/tmplrewrite.py mode=555
 file path=usr/demo/mercurial/undumprevlog mode=555
 file path=usr/demo/mercurial/vim/HGAnnotate.vim
 file path=usr/demo/mercurial/vim/hg-menu.vim