3 ms·
This uses the so called "octopus" merge strategy in git as described at https://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_merge_strategies https:
by ward 10y ago
This uses the so called "octopus" merge strategy in git as described at https://www.kernel.org/pub/software/scm/git/docs/git-merge.html#_merge_strategies https://www.kernel.org/pub/software/scm/git/docs/git-merge.h...