diff --git a/hgmerge b/hgmerge