log

age author description
Mon, 16 Nov 2015 13:44:27 -0500 Matt Harbison test-ssh: stop quoting dummyssh invocation for Windows
Fri, 20 Nov 2015 13:46:36 -0800 Laurent Charignon strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Fri, 20 Nov 2015 13:23:47 -0800 Laurent Charignon histedit: make use of bookmarks.recordchange instead of bookmarks.write
Wed, 18 Nov 2015 17:40:13 -0800 Siddharth Agarwal largefiles: fall back to the original for change/delete conflicts
Sat, 14 Nov 2015 00:07:11 -0800 Siddharth Agarwal mergestate.add: store absentfilectxes as nullhex
Fri, 20 Nov 2015 01:14:15 -0800 Siddharth Agarwal mergestate._resolve: handle change/delete conflicts
Sat, 14 Nov 2015 00:00:46 -0800 Siddharth Agarwal filemerge: don't try to copy files known to be absent