underscorify implicitly private methods
remove a never-called routine
remove a patently false line

maybe it should be moved lower, instead...

...but I can see no reason to keep it
implement combine_hunks
Merge branch 'pr/1'
Releng for 2.08