log

age author description
Fri, 15 Aug 2014 20:28:51 +0900 FUJIWARA Katsunori largefiles: add test for large/normal conflict at linear merging
Fri, 15 Aug 2014 20:28:51 +0900 FUJIWARA Katsunori largefiles: put whole "hgmerge" process into the same "wlock" scope