]> git.cworth.org Git - lmno-todo/commitdiff
nogit-sync merge
authorCarl Worth <cworth@cworth.org>
Sun, 5 Jul 2020 05:56:42 +0000 (22:56 -0700)
committerCarl Worth <cworth@cworth.org>
Sun, 5 Jul 2020 05:56:42 +0000 (22:56 -0700)
1  2 
TODO

diff --cc TODO
index b7c545d5821efb39e41f4d598589f986e71be4c1,f42165c84dfc758841134e4a41fd768f8a7d7290..95d25a4d15adaf2aa421c2e48741aa80e849aa4f
--- 1/TODO
--- 2/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.