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

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