Mercurial > hg-stable
graph
-
largefiles: fall back to the original for change/delete conflictsWed, 18 Nov 2015 17:40:13 -0800, by Siddharth Agarwal
-
mergestate.add: store absentfilectxes as nullhexSat, 14 Nov 2015 00:07:11 -0800, by Siddharth Agarwal
-
mergestate._resolve: handle change/delete conflictsFri, 20 Nov 2015 01:14:15 -0800, by Siddharth Agarwal
-
filemerge: don't try to copy files known to be absentSat, 14 Nov 2015 00:00:46 -0800, by Siddharth Agarwal