#131858 tkcvs: changes merge could distinguish "add" vs. "remove" mode