diff options
| author | Mark Levedahl <mlevedahl@gmail.com> | 2024-02-13 00:13:10 -0500 |
|---|---|---|
| committer | Mark Levedahl <mlevedahl@gmail.com> | 2025-07-18 23:48:06 -0400 |
| commit | e42ba88178c0088cba7cca521a671c92aaa4a300 (patch) | |
| tree | 069eb18f786d6230e72428f25ad09a17d9faf02f /git-gui/lib/commit.tcl | |
| parent | 940640de8bf219b9cb17e1ee670baa170e0e75c6 (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>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions