3 ms·
This commit has 6225 parents
- ward 10y agoThis 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...