]> git.99rst.org Git - git.git/commitdiff
Merge branch 'rs/merge-compact-summary'
authorJunio C Hamano <redacted>
Tue, 12 Aug 2025 04:30:16 +0000 (21:30 -0700)
committerJunio C Hamano <redacted>
Tue, 12 Aug 2025 04:30:16 +0000 (21:30 -0700)
Hotfix.

* rs/merge-compact-summary:
  merge: don't document non-existing --compact-summary argument

1  2 
builtin/merge.c

diff --cc builtin/merge.c
Simple merge
git clone https://git.99rst.org/PROJECT