view tests/test-merge4.out @ 11620:86b49e0083a7

protocol: do not translate error messages on the remote side
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 16 Jul 2010 23:02:46 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)