thodg/got

diff --git a/TODO b/TODO
index 76a57cf..aa3f4dd 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,8 @@ lib:
   ignoring such tree entries; requires a .ini config parser (from isakmpd?)
 - 'got log' in a work tree does not work because the current working directory
    is unveiled instead of the repository path
+- implement 'got status' to detect modified files in work tree
+- make 'got update' perform a 3-way merge for modified files
 
 tog:
 - make diff view generate diffs in a background thread