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
|
Tue, 14 Aug 2007 21:36:08 +0200 |
Thomas Arendsen Hein |
merge with crew-stable
|
Tue, 14 Aug 2007 19:30:14 +0200 |
Patrick Mezard |
Merge with crew-stable
|
Tue, 14 Aug 2007 19:06:10 +0200 |
Patrick Mezard |
Merge with crew-stable
|
Tue, 14 Aug 2007 18:25:27 +0200 |
Benoit Boissinot |
fix bundlerepo broken by 4205f626dc05
|
Tue, 14 Aug 2007 16:30:38 +0200 |
Patrick Mezard |
Merge with crew-stable
|
Mon, 13 Aug 2007 11:58:47 -0700 |
Brendan Cully |
imerge: simplify 1d5ebb0d366f
|