mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-11 21:18:46 -05:00
Mention --diff-merges instead of -m in a note to merge formats to aid discoverability, as -m is now described among --diff-merges options anyway. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
6.8 KiB
6.8 KiB