3 Commits

Author	SHA1	Message	Date
Brendan Cully	ea84333a75	Make pull -u behave like pull && update ... Previously, pull would not update if new branch heads were received, whereas pull && update would move to the tipmost branch head. Also change the "crosses branches" abort in merge.update from "crosses branches (merge branches or use --check to force update)" to "crosses branches (merge branches or update --check to force update)" since it can no longer assume the user is running hg update.	2011-05-31 11:52:22 -07:00
Sune Foldager	843894f4b3	tests: remove exec bit from .t files	2010-09-14 16:03:10 +02:00
Adrian Buehlmann	79059e20c1	combine tests	2010-09-14 12:20:51 +02:00