Commit Diff

Commit:
81273528436d00b3a24332dcfe76e5b3f9666363
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
remove a TODO item that's done
Actions:
Patch | Tree
commit - 70a0c8ec6e6b62f44cf81a937107e64429ee5572
commit + 81273528436d00b3a24332dcfe76e5b3f9666363
blob - d99603e8e32be895b97e95ab2d4ee92ecb3b5161
blob + 52786231728d4b2061e98aa0073b0ac6ef585257
--- TODO
+++ 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')