projects / ostree.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89481ca 788e171)
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)
docs: Add more details about 3-way merge


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.