Merge pull request #425 from samoht/CHANGES

Update CHANGES

CHANGES.md

@@ -1,3 +1,16 @@
+### 1.0.1 (2017-03-14)
+
+*** irmin ****
+
+- Default merge function should not assume idempotence of edits
+  (#420, @kayceesrk)
+- Wrap the merge functions for pair and triple with the default case.
+  (#420, @kayceesrk)
+
+*** irmin-unix ***
+
+- Support all versions of cmdliner, 1.0.0 included (@samoht)
+
 ### 1.0.0 (2017-02-21)
 
 Major API changes:

appveyor.yml

@@ -3,18 +3,16 @@ platform:
 
 environment:
   global:
-    CYG_ROOT: "C:\\cygwin"
-    CYG_BASH: "%CYG_ROOT%\\bin\\bash -lc"
+    FORK_USER: ocaml
+    FORK_BRANCH: master
+    CYG_ROOT: C:\cygwin64
     PINS: "irmin.dev:. irmin-http.dev:. irmin-git.dev:. irmin-mirage.dev:. irmin-unix.dev:."
-    ALCOTEST_SHOW_ERRORS: "true"
   matrix:
   - PACKAGE: "irmin-unix.dev"
   - PACKAGE: "irmin-mirage.dev"
 
 install:
-  - appveyor DownloadFile https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/appveyor-opam.sh
-  - "%CYG_ROOT%\\setup-x86.exe -qnNdO -R %CYG_ROOT% -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P rsync -P patch -P make -P git -P perl -P mingw64-x86_64-gcc-core"
-  - curl -L -o C:/cygwin/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-win32.exe
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))
 
 build_script:
-  - "%CYG_BASH% '${APPVEYOR_BUILD_FOLDER}/appveyor-opam.sh'"
+  - call %CYG_ROOT%\bin\bash.exe -l %APPVEYOR_BUILD_FOLDER%\appveyor-opam.sh