Mercurial > hg
log
| age | author | description |
|---|---|---|
| Wed, 25 Nov 2015 00:39:05 +0000 | timeless | run-tests: add --slowtimeout and use it for slow tests |
| Sat, 31 Oct 2015 22:17:05 +0900 | Yuya Nishihara | serve: unify cmdutil.service() calls of commandserver and hgweb |
| Sat, 31 Oct 2015 22:15:16 +0900 | Yuya Nishihara | hgweb: extract factory function of httpservice object |
| Sat, 31 Oct 2015 21:57:45 +0900 | Yuya Nishihara | hgweb: move httpservice object from commands module |
| Wed, 25 Nov 2015 14:25:33 -0800 | Siddharth Agarwal | merge: move almost all change/delete conflicts to resolve phase (BC) (API) |
| Wed, 25 Nov 2015 14:26:46 -0800 | Siddharth Agarwal | test-merge-changedelete.t: print out debugmergestate |
| Tue, 24 Nov 2015 18:26:21 -0800 | Siddharth Agarwal | debugmergestate: also recognize change/delete conflicts in the merge state |