log

age author description
Mon, 30 Nov 2015 10:19:39 -0800 Siddharth Agarwal merge: add a new action type representing files to add/mark as modified
Mon, 30 Nov 2015 10:03:21 -0800 Siddharth Agarwal mergestate: add a cached property accessor for the local context
Mon, 30 Nov 2015 10:05:09 -0800 Siddharth Agarwal mergestate: raise exception if otherctx is accessed but _other isn't set
Mon, 30 Nov 2015 18:47:33 +0000 timeless pager: improve help for --pager=
Tue, 24 Nov 2015 21:17:26 -0800 Gregory Szorc setup: remove unused py_modules argument to setup()
Mon, 23 Nov 2015 13:45:56 -0800 Siddharth Agarwal test-merge-changedelete.t: add resolve --list output
Mon, 23 Nov 2015 13:43:14 -0800 Siddharth Agarwal test-merge-changedelete.t: add a file with regular merge conflicts
Tue, 24 Nov 2015 10:58:35 -0800 Siddharth Agarwal filemerge: in ':prompt', use ':fail' tool rather than returning directly
Tue, 24 Nov 2015 10:57:01 -0800 Siddharth Agarwal filemerge: in ':fail' tool, write out other side if local side is deleted
Mon, 23 Nov 2015 18:03:25 -0800 Siddharth Agarwal mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
Mon, 23 Nov 2015 19:06:15 -0800 Siddharth Agarwal merge.applyupdates: add all actions returned from merge state
Fri, 27 Nov 2015 20:23:23 +0100 Mathias De Maré identify: refer to log to be able to view full hashes