The non-conflict-resolution patches will apply cleanly
to branch 2.12.
Maybe it'd be better to push amended versions to HEAD instead
of having the conflict resolutions, I won't screen this for
a bit.
6 patches for repository darcs-unstable@darcs.net:screened:
patch f3be1bf31c7fb97a6f10e1b1cc3be2a2e3f740b0
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Thu Dec 29 22:46:43 GMT 2016
* support time 1.7
patch 627c40af9ddd738e625aaaf5acb51580f22c55af
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Thu Dec 29 23:27:20 GMT 2016
* resolve conflicts in time version bump
patch e29416948fae27ff2ce8ace05e9644518e39fec1
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Thu Dec 29 22:57:19 GMT 2016
* support HUnit 1.4 and 1.5
patch 079e74c9ad263c00c16c684c0c5154c6c2734d36
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Thu Dec 29 23:30:27 GMT 2016
* resolve conflicts in HUnit version bump
patch d6e9681bdac6180185ca6b1f745f715b5f634cfc
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Thu Dec 29 23:25:29 GMT 2016
* support directory 1.3
patch 06b260766684dcfdc0c8dd1b8def1700cc11f775
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Thu Dec 29 23:31:21 GMT 2016
* resolve conflicts in directory version bump
Update to bump vector too
As before the non-conflict resolutions are for 2.12
2 patches for repository /home/ganesh/darcs/screened-temp:
patch 6ca1b9891ee0b269a91db2e079b05bcd3a12c19e
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Tue Jan 10 07:55:21 GMT 2017
* support vector 0.12
patch 378d4cbc2828bd0282a723c7ecceab9e9aae28c3
Author: Ganesh Sittampalam <ganesh@earth.li>
Date: Tue Jan 10 21:11:11 GMT 2017
* resolve conflicts in vector version bump