view tests/test-bookmarks-current.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 717c35d55fb3
children e5aaaef91a27
line wrap: on
line source

% no bookmarks
no bookmarks set
% set bookmark X
% list bookmarks
 * X                         -1:000000000000
% list bookmarks with color
 * X                         -1:000000000000
% update to bookmark X
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% list bookmarks
 * X                         -1:000000000000
% rename
% list bookmarks
 * Z                         -1:000000000000
% new bookmark Y
% list bookmarks
 * Y                         -1:000000000000
   Z                         -1:000000000000
% commit
% list bookmarks
 * Y                         0:719295282060
   Z                         -1:000000000000
% delete bookmarks
% list bookmarks
no bookmarks set
% update to tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved