comparison tests/test-merge4.out @ 2178:00205fe76993

merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children
comparison
equal deleted inserted replaced
2177:6886bc0b77af 2178:00205fe76993
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 (branch merge, don't forget to commit)