log

age author description
Fri, 23 May 2014 13:10:31 -0700 Siddharth Agarwal resolve: don't abort resolve -l even when no merge is in progress
Fri, 23 May 2014 16:25:55 -0700 Durham Goode templates: fix ifcontains against sets with length > 1 (issue4259) stable
Sun, 25 May 2014 13:47:42 +0200 Mads Kiilerich run-tests: assign value to ESCAPEMAP - dict.update do not return self
Sun, 25 May 2014 13:47:19 +0200 Mads Kiilerich run-tests: fix invalid reference to stringescape after a36cc85a5b7b
Fri, 09 May 2014 18:09:11 -0700 Durham Goode update: specify custom conflict markers for update (BC)
Fri, 09 May 2014 16:13:14 -0700 Gregory Szorc run-tests: add docstrings