log

age author description
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: pretend ancestor is local to simplify backwards and overwrite
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify flag merging code slightly