view tests/test-merge2.out @ 6014:2f424fc4edb3

mergetools: correct vim typo
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Feb 2008 09:53:10 -0600
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b