Mercurial > hg
log
age | author | description |
---|---|---|
Thu, 11 Dec 2014 21:06:16 -0800 | Martin von Zweigbergk | merge: let _resolvetrivial() work on the file->action dict |
Thu, 11 Dec 2014 20:56:53 -0800 | Martin von Zweigbergk | merge: let bid merge work on the file->action dict |
Mon, 08 Dec 2014 13:24:10 -0800 | Martin von Zweigbergk | merge: write manifestmerge() using dictionary with entry per file |