From: Carl Worth <cworth@cworth.org>
Date: Sun, 5 Jul 2020 05:56:42 +0000 (-0700)
Subject: nogit-sync merge
X-Git-Url: https://git.cworth.org/git?p=lmno-todo;a=commitdiff_plain;h=9bc4e50acf0f3f56226295198d717864411b3c4f

nogit-sync merge
---

9bc4e50acf0f3f56226295198d717864411b3c4f
diff --cc TODO
index b7c545d,f42165c..95d25a4
--- a/TODO
+++ b/TODO
@@@ -1,3 -1,4 +1,5 @@@
  Implement auto push/pull for TODO file.
  
 +Test nogit sync
+ Ensure that upstream commits are handled correctly.
+