From: Dan Nicholson Date: Fri, 30 Apr 2021 16:14:52 +0000 (-0600) Subject: Merge pull request #2355 from jlebon/pr/etc-merge-moar-docs X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~3^2~22 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af723f9a2a7baf28ccb4a037b2c97737621fba56;p=ostree.git Merge pull request #2355 from jlebon/pr/etc-merge-moar-docs docs: Add more details about 3-way merge --- af723f9a2a7baf28ccb4a037b2c97737621fba56