t6038 (merge.renormalize): try checkout -m and cherry-pick