Merge pull request #2355 from jlebon/pr/etc-merge-moar-docs
authorDan Nicholson <dbn@endlessos.org>
Fri, 30 Apr 2021 16:14:52 +0000 (10:14 -0600)
committerGitHub <noreply@github.com>
Fri, 30 Apr 2021 16:14:52 +0000 (10:14 -0600)
commitaf723f9a2a7baf28ccb4a037b2c97737621fba56
tree26136076b6c44d633cb9d46c449a4a45095abf58
parent89481ca4be2a5c52f7b3d4ff4a32b14cd6e982ab
parent788e171b7cf3ff87b2a73cd4734644eebb9db989
Merge pull request #2355 from jlebon/pr/etc-merge-moar-docs

docs: Add more details about 3-way merge