From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Aug 2025 20:46:56 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-allow-drop-on-a-merge'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fe6955fd4e0de21a5581376589c8df56fae6adf;p=thirdparty%2Fgit.git

Merge branch 'js/rebase-i-allow-drop-on-a-merge'

During interactive rebase, using 'drop' on a merge commit lead to
an error, which was incorrect.

* js/rebase-i-allow-drop-on-a-merge:
  rebase -i: permit 'drop' of a merge commit
---

1fe6955fd4e0de21a5581376589c8df56fae6adf