Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 21261:6ca05c46aa95
| age | author | description |
|---|---|---|
| Thu, 08 May 2014 16:48:28 -0700 | Gregory Szorc | mergestate: consistently set variables to None |
| Wed, 30 Apr 2014 14:19:01 -0500 | Matt Mackall | ancestor: silence multiple ancestor warning outside of merge (issue4234) stable |
| Mon, 21 Apr 2014 20:24:54 +0200 | Mads Kiilerich | merge: improve notes for listing the bids for ambiguous merges stable |
| Fri, 18 Apr 2014 13:33:20 +0200 | Mads Kiilerich | merge: tell the user when we are using bid merge stable |
| Mon, 21 Apr 2014 20:22:14 +0200 | Mads Kiilerich | merge: fix stray character in bid merge message stable |
| Mon, 21 Apr 2014 19:53:19 +0200 | Mads Kiilerich | merge: fix wrong number of arguments for bid merge message stable |