##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

updated help text and added manpage section for hg paths...
updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================
mpm@selenic.com - - Load All Authors

File last commit:

r896:01215ad0 merge default
r924:ab681ea2 default
Show More
test-merge-revert.out
46 lines | 701 B | text/plain | TextLexer
/ tests / test-merge-revert.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 + hg init
+ hg add file1 file2
Thomas Arendsen Hein
Updated output of tests.
 r801 + hg commit -m added file1 and file2 -d 0 0 -u user
+ hg commit -m changed file1 -d 0 0 -u user
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
 r792 + hg -q log
1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c
0:8633637036c18f021d771208e16ae3508ab81d28
+ hg id
3aa14bbc23d9 tip
+ hg update -C 0
+ hg id
8633637036c1
+ hg id
8633637036c1+
+ hg revert
+ hg diff
+ hg status
+ hg id
8633637036c1
+ hg update
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg update -C 0
+ hg update
merging file1
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg revert
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg revert -r tip
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip
+ hg update -C
+ hg diff
+ hg status
+ hg id
3aa14bbc23d9 tip