Mercurial > hg
log mercurial/merge.py @ 29629:b33c0c38d68f stable
age | author | description |
---|---|---|
Thu, 21 Jul 2016 15:55:47 -0700 | Kostia Balytskyi | update: fix bug when update tries to modify folder symlink stable |
Fri, 01 Jul 2016 17:42:55 +0200 | Kostia Balytskyi | update: teach hg to override untracked dir with a tracked file on update |
Fri, 10 Jun 2016 00:12:33 -0400 | Augie Fackler | cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1 |
Thu, 26 May 2016 01:57:34 +0900 | FUJIWARA Katsunori | merge: make messages translatable |
Mon, 16 May 2016 21:30:53 +0000 | timeless | py3: convert to next() function |
Wed, 11 May 2016 09:31:47 +0200 | Pierre-Yves David | devel: officially deprecate update without destination |
Sun, 08 May 2016 10:43:41 +0200 | Pierre-Yves David | devel: use the new 'config' argument for the update develwarn |