diff tests/test-update.py @ 45:191855a9d813

client: add merge command
author Idan Kamara <idankk86@gmail.com>
date Tue, 16 Aug 2011 23:57:21 +0300
parents f6e1d9a6e0cd
children a0328b08e028
line wrap: on
line diff