projects / ostree.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 89481ca) | patch
docs: Add more details about 3-way merge
authorJonathan Lebon <jonathan@jlebon.com>
Fri, 30 Apr 2021 14:50:15 +0000 (10:50 -0400)
committerJonathan Lebon <jonathan@jlebon.com>
Fri, 30 Apr 2021 14:50:15 +0000 (10:50 -0400)
commit788e171b7cf3ff87b2a73cd4734644eebb9db989
tree26136076b6c44d633cb9d46c449a4a45095abf58tree | snapshot
parent89481ca4be2a5c52f7b3d4ff4a32b14cd6e982abcommit | diff
docs: Add more details about 3-way merge

This came up a few times so let's go into more details in the docs.
docs/atomic-upgrades.md diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.