F2890688

F2890688: no-merge-hunks.diff