update on some of the conflict cases
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 17:56:58 +0000 (13:56 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 17:56:58 +0000 (13:56 -0400)
commit20cae78ac793be8d1ccc919e2c57a52c7551d9ba
tree844e47d8ee325e8fa5aef5fa93f08ebf10f473d4
parent494e7ab8baedb5e4f8c7d1ff0d88ecd8b7d4a775
update on some of the conflict cases
doc/todo/Moving_Pages.mdwn