comparison tests/test-evolve-obshistory.t @ 2546:abe6dfbdc744 stable

evolve: fix typo: -list -> --list
author Kyle Lippincott <spectral@google.com>
date Tue, 06 Jun 2017 15:10:13 -0700
parents 262d684851dc
children b5e3fe610beb
comparison
equal deleted inserted replaced
2545:cb0d62ed5e2a 2546:abe6dfbdc744
1033 (use --hidden to access hidden revisions; diverged) 1033 (use --hidden to access hidden revisions; diverged)
1034 [255] 1034 [255]
1035 $ hg update --hidden 'desc(A0)' 1035 $ hg update --hidden 'desc(A0)'
1036 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1036 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1037 working directory parent is obsolete! (471f378eab4c) 1037 working directory parent is obsolete! (471f378eab4c)
1038 (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue) 1038 (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
1039 1039
1040 Test output with amended + folded commit 1040 Test output with amended + folded commit
1041 ======================================== 1041 ========================================
1042 1042
1043 Test setup 1043 Test setup