diffmerge.h #2