add suport for hyp_merge_mode=2 when using hg-based training

git-svn-id: https://joshua.svn.sf.net/svnroot/joshua/trunk@1415 0ae5e6b2-d358-4f09-a895-f82f13dd62a4
5 files changed