History combine-diff.c