]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 940640d) | patch
git-gui: git merge understands --strategy=recursive
authorMark Levedahl <mlevedahl@gmail.com>
Tue, 13 Feb 2024 05:13:10 +0000 (00:13 -0500)
committerMark Levedahl <mlevedahl@gmail.com>
Sat, 19 Jul 2025 03:48:06 +0000 (23:48 -0400)
commite42ba88178c0088cba7cca521a671c92aaa4a300
tree069eb18f786d6230e72428f25ad09a17d9faf02ftree
parent940640de8bf219b9cb17e1ee670baa170e0e75c6commit | diff
git-gui: git merge understands --strategy=recursive

git-gui's merge driver includes code to invoke the recursive strategy
for merging prior to git v2.5 that added a simpler syntax. As git-gui
requires git v2.36 or later, let's delete the code targeting earlier
git.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
lib/merge.tcl diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.