diffmerge.cc #1