merge: setup `opts` later in `checkout_fast_forward()`
authorMartin Ågren <martin.agren@gmail.com>
Sun, 20 May 2018 10:17:34 +0000 (12:17 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 May 2018 21:56:15 +0000 (06:56 +0900)
commit89e653d...5b1bee9cf645e9d4bdd95f6bb31cc4b9
tree728bce3...5c70705267b669fd3e5ac2f365d6288acopy hash to clipboard (tree)
parent6f10a09...0a1a7c3c3a6ee8e67390a4839dbe6a1bcopy hash to clipboard (diff)
merge.c