diff tests/test-merge-revert2.out @ 2782:0148869345f7

merge with self.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 04 Aug 2006 10:38:17 -0700
parents b2ae81a7df29
children ad6f34c83c3d
line wrap: on
line diff