5 Commits

Author	SHA1	Message	Date
Erik Huelsmann	5e269b46c8	filemerge: add 'union' merge to internal merge tool ... 'union merge' is a merge strategy which adds both left and right hand side of a conflict region. Git implements this merge strategy which is very practical to have for merging e.g. the Changelog file.	2015-08-16 10:19:00 +02:00
Matt Mackall	200e89394d	tests: fix a bunch of pointless #s in unified tests	2010-09-17 17:03:08 -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
Adrian Buehlmann	6fa6d14d98	tests: unify test-merge-internal-tools-pattern	2010-09-11 20:04:35 +02:00