Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 23426:19ebd2f88fc7
age | author | description |
---|---|---|
Mon, 01 Dec 2014 19:34:11 -0600 | Matt Mackall | merge with stable |
Mon, 01 Dec 2014 02:30:21 +0100 | Mads Kiilerich | merge: before cd/dc prompt, check that changed side really changed stable 3.2.2 |
Wed, 26 Nov 2014 15:37:01 -0800 | Pierre-Yves David | manifest: document the extra letter in working copy manifest node |