facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 17:27:53 +03:00
Code Issues Projects Releases Wiki Activity
16,322 Commits 25 Branches 62 Tags 327 MiB
3e2b4220e7
Commit Graph

6 Commits

Author SHA1 Message Date
Matt Mackall
66de5cde16 merge: give a special message for internal:merge failure (issue3105) 2011-11-16 18:04:19 -06:00
Patrick Mezard
ee7651120f Improve unresolved merge conflicts warning (issue2681) 
Suggested by Antoine Pitrou <pitrou@free.fr>
 2011-03-06 15:21:50 +01:00
Matt Mackall
bf9417da11 tests: exit 0 no longer needed on unified tests 2010-09-17 17:03:04 -05:00
Matt Mackall
08439e0f2d tests: add exit codes to unified tests 2010-09-16 17:51:32 -05:00
Brodie Rao
4be7b3bfc3 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' 
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
 2010-09-12 18:05:53 -05:00
Nicolas Dumazet
ccfb72c083 tests: unify test-commit-unresolved 2010-08-12 22:28:21 +09:00