git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-05 17:40:24 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
cc9e162aa1e7b0ebb6443200f33889deca94de69
git/t/t4301-merge-tree-write-tree.sh
Tang Yuyi 6a4c9e7b32 merge-tree: add -X strategy option 
Add merge strategy option to produce more customizable merge result such
as automatically resolving conflicts.

Signed-off-by: Tang Yuyi <winglovet@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-09-25 14:37:42 -07:00

26 KiB
Executable File
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink