log

age author description
Tue, 13 Mar 2012 16:28:08 -0500 Matt Mackall merge: handle linear update to symlink correctly (issue3316) stable
Tue, 13 Mar 2012 15:12:26 -0500 Matt Mackall filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 stable
Mon, 12 Mar 2012 17:05:42 -0500 Matt Mackall merge with stable