##// END OF EJS Templates
New option -i/--ignored for 'hg status' to show ignored files....
New option -i/--ignored for 'hg status' to show ignored files. localrepo.changes() now returns an additional list of ignored files if it is called with show_ignored=True.

File last commit:

r1933:7544700f default
r2022:a59da8cc default
Show More
test-merge-revert.out
12 lines | 186 B | text/plain | TextLexer
/ tests / test-merge-revert.out
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
eb43f19ff115
016807e6fdaf tip
Thomas Arendsen Hein
Added tests for bug with three-way-merging of old tip, tip and cwd.
r792 merging file1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 016807e6fdaf tip
016807e6fdaf tip
016807e6fdaf tip
016807e6fdaf tip