view tests/test-merge4.out @ 2351:075d2ddc4639

contrib: move hg-menu.vim into contrib/vim directory
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 27 May 2006 20:45:22 -0700
parents b2ae81a7df29
children
line wrap: on
line source

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)