view tests/test-up-issue1456.out @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
parents f331de880cbb
children
line wrap: on
line source

abort: uncommitted local changes
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