##// END OF EJS Templates
fancyopts: drop unneeded import...
fancyopts: drop unneeded import -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fancyopts: drop unneeded import manifest hash: 09729db8a301510f021fd84a9e82a16ea3ccc67b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxZegywK+sNU5EO8RAnJwAKCn8kw2VzLc1NgObPFyYI1NxtBJSACgk1v4 d041JB9E0PybyftBFV55Of0= =Cp7N -----END PGP SIGNATURE-----

File last commit:

r402:2fe8d66e default
r560:f9ad1a2c default
Show More
test-merge3.out
9 lines | 182 B | text/plain | TextLexer
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-tcomment #1' -d '0 0' -u user
b never committed!