Remove diffs between branch-2 and trunk