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

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