diffmerge.cc #2