F2896255

F2896255: merge-hunks.diff