Wed, 15 Aug 2007 17:27:51 +0200 Sascha Wilde Use smerge minor mode in emacs to resolve conflicts.
Wed, 15 Aug 2007 16:43:40 +0200 Patrick Mezard Merge with crew-stable
(0) -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip