Mercurial > hg
view tests/test-586 @ 6014:2f424fc4edb3
mergetools: correct vim typo
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Feb 2008 09:53:10 -0600 |
parents | 720ae5085ee3 |
children | f1af59451c0c |
line wrap: on
line source
#!/bin/sh # a test for issue586 hg init a cd a echo a > a hg ci -Ama hg init ../b cd ../b echo b > b hg ci -Amb hg pull -f ../a hg merge hg rm -f a hg ci -Amc hg st -A