Mercurial > hg
view tests/test-up-issue1456.out @ 7731:737f274d1915
test-merge-tools
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 25 Jan 2009 21:20:11 +0100 |
parents | a679bd371091 |
children | f331de880cbb |
line wrap: on
line source
dirty M foo % validate update of standalone execute bit change 1 files updated, 0 files merged, 0 files removed, 0 files unresolved nothing changed 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved