log

age author description
Mon, 07 Mar 2011 15:03:10 -0600 Matt Mackall merge: back out single-parent fast-forward merge stable
Sat, 05 Mar 2011 16:34:59 -0600 Matt Mackall merge: drop resolve state for mergers with identical contents (issue2680) stable
Sun, 06 Mar 2011 22:13:36 +0100 Patrick Mezard merge with stable