-On [20090702 17:15], Jesus Cea (j...@jcea.es) wrote: >Ughhh. This is actually a good reason to migrate to mercurial, were >merges are painless :-).
For all I know Mercurial doesn't make the issue of resolving content merges easier, so that would make your comment moot. -- Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai イェルーン ラウフロック ヴァン デル ウェルヴェン http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B When you do something, you should burn yourself completely, like a good bonfire, leaving no trace of yourself... _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
