Mercurial > hg
view contrib/win32/postinstall.txt @ 39393:56469d475341
resolve: add config to make hg resolve not re-merge by default
Before this, calling 'hg resolve' with neither -m, -u or -l will
re-merge. This is highly error prone (it's easy to forget to forget a
-m), and pretty bad when it happens (many people have no idea 'hg
resolve' can re-merge, and end up redoing the work of resolving all
the conflicts, because they have no idea there was a backup of their
work).
Differential Revision: https://phab.mercurial-scm.org/D4379
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Sun, 26 Aug 2018 16:42:28 -0400 |
parents | 4b0fc75f9403 |
children |
line wrap: on
line source
Welcome to Mercurial for Windows! --------------------------------- For configuration and usage directions, please read the ReadMe.html file that comes with this package. Also check the release notes at: https://mercurial-scm.org/wiki/WhatsNew