commit 962b0cd93c96621175a3866d23b737026775969f
from: Stefan Sperling <stsp@stsp.name>
date: Wed Aug 14 10:27:49 2019 UTC

wrap

commit - 6ef7de4c9b01d9c6fac92afab8f824ba98f096a8
commit + 962b0cd93c96621175a3866d23b737026775969f
blob - 2d2ec5603866576e4472b31cfa642bcc47fd7495
blob + 990f8f5310d4cee49c2f4fd2cb976e744861895d
--- notes-pull-push
+++ notes-pull-push
@@ -8,9 +8,9 @@ changes apply to the expected 'base blob' content (whi
 conflict-free file merge according to diff3), all added blobs get
 added where no blob exists yet, and only existing blobs get deleted.
 
-This part of gotd(8) would operate roughly like some sort of Gerrit server
-with merge strategy set to 'rebase-if-necessary', but without a code
-review UI and without Java.
+This part of gotd(8) would operate roughly like some sort of Gerrit
+server with merge strategy set to 'rebase-if-necessary', but without
+a code review UI and without Java.
 
 gotd(8) would also regulate read/write access to branches and perform
 various sanity checks on commits: require a log message, reject merge