13 Commits

Author	SHA1	Message	Date
Matt Mackall	3afbc844f5	merge with stable	2011-05-15 13:15:41 -05:00
Steve Borho	48f0028601	simplemerge: do not allow binary files to abort an entire merge ... When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.	2011-05-13 19:46:36 -05:00
Matt Mackall	51b3b09c8f	backout most of 26e0b9a8ce0d	2010-09-24 12:46:54 -05:00
Brodie Rao	7362459729	cleanup: use x in (a, b) instead of x == a or x == b	2010-09-23 00:02:31 -05:00
Mads Kiilerich	9876c3e7ec	simplemerge: remove hash-bang from non-executable script	2010-08-26 22:51:48 +02:00
Adrian Buehlmann	cf126bb7dd	move opener from util to scmutil	2011-04-20 19:54:57 +02:00
Matt Mackall	8d99be19f0	many, many trivial check-code fixups	2010-01-25 00:05:27 -06:00
Simon Heimberg	09ac1e6c92	separate import lines from mercurial and general python modules	2009-04-28 17:40:46 +02:00
Steve Borho	83629eeaea	simplemerge: use ui.warn() for warnings	2009-04-30 23:57:36 -05:00
Benoit Boissinot	ea7fe6dacc	remove unused variables	2008-10-28 19:25:26 +01:00
Matt Mackall	6c908ebf9b	chmod -x simplemerge.py	2008-10-22 13:05:40 -05:00
Joel Rosdahl	4f8012378a	Remove unused imports	2008-03-06 22:23:41 +01:00
Matt Mackall	346758f77c	merge: move the bulk of simplemerge into core ... - keep existing simplemerge command in contrib - clean up test interface	2008-02-03 19:29:05 -06:00