Commit 81273528436d00b3a24332dcfe76e5b3f9666363
2019-02-21T09:31:01
remove a TODO item that's done
diff --git a/TODO b/TODO
index d99603e..5278623 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
lib:
- handle checkout of trees which contain submodules by identifying and
ignoring such tree entries; requires a .ini config parser (from isakmpd?)
-- make 'got update' perform a 3-way merge for modified files
tog:
- allow loading new commits in 'tog log' after startup (e.g. via Ctrl-L, 'r')