##// END OF EJS Templates
Remove stdint.h from mpatch and bdiff...
Remove stdint.h from mpatch and bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove stdint.h from mpatch and bdiff It's only there for ntohl and htonl and should be pulled in by in.h. manifest hash: 65954290279241ac92c9ce04c21cf1a3c9dd54e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwD8KywK+sNU5EO8RAhv2AJ40R/T72XK63IbeEFqMLSRJbRJWdACcDa9r dOL9XpyYxR09REbAHw0JrlE= =8wkZ -----END PGP SIGNATURE-----

File last commit:

r415:c2b9502a default
r486:098d1f03 default
Show More
test-merge5.out
18 lines | 432 B | text/plain | TextLexer
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0