Issue #38: merge-parser: Increase bits in hash by using file|line<<32

The previous version used file^line.