docs/tutorial/.netlify
author Pulkit Goyal <7895pulkit@gmail.com>
Sun, 29 Apr 2018 18:48:36 +0530
changeset 3736 4b8c63d14f18
parent 3376 aad37ffd7d58
permissions -rw-r--r--
evolve: store the evolvestate file when encountering conflicts This patch makes `hg evolve` store the evolvestate file when it encounters merge conflicts while resolving content-divergence.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3376
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
{"site_id":"cf023865-0eb1-49e9-951b-29555949abf0","path":"html/"}