comparison tests/test-log.py @ 45:191855a9d813

client: add merge command
author Idan Kamara <idankk86@gmail.com>
date Tue, 16 Aug 2011 23:57:21 +0300
parents b68c444d42bb
children c635e6e7054f
comparison
equal deleted inserted replaced
44:3a661f63107e 45:191855a9d813