tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 14:41:52 -0700
changeset 2268 6c9305fbebaf
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix coding style of backout editor change.

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