From: Tang Yuyi <winglovet@gmail.com>

Add merge strategy option to produce more customizable merge result such
as automatically resolving conflicts.

Signed-off-by: Tang Yuyi <winglovet@gmail.com>

Submitted-As: https://lore.kernel.org/git/pull.1565.v5.git.1694853437494.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1565.git.1691245481977.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1565.v2.git.1691818386345.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1565.v3.git.1694830462463.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.1565.v4.git.1694836025469.gitgitgadget@gmail.com