diff options
| author | Tang Yuyi <winglovet@gmail.com> | 2023-09-24 02:23:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-25 14:37:42 -0700 |
| commit | 6a4c9e7b32c4154345785bd7b8d4afee5fddcead (patch) | |
| tree | b15f3236e6ea55eede80abe34ca9b171ca2a3e28 /merge-recursive.c | |
| parent | The twelfth batch (diff) | |
| download | git-6a4c9e7b32c4154345785bd7b8d4afee5fddcead.tar.gz git-6a4c9e7b32c4154345785bd7b8d4afee5fddcead.zip | |
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions