Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 18916:6edb0e18b83c
| age | author | description |
|---|---|---|
| Tue, 15 Jan 2013 01:05:11 +0100 | Mads Kiilerich | merge: warn when internal:merge cannot merge symlinks |
| Tue, 08 Jan 2013 04:15:46 +0100 | Mads Kiilerich | merge: never do premerge on symlinks |
| Tue, 08 Jan 2013 04:15:41 +0100 | Mads Kiilerich | merge: make internal merge fail cleanly on symlinks |
| Fri, 26 Oct 2012 12:02:58 -0700 | Keegan Carruthers-Smith | filemerge: use util.shellquote when calling merge (issue3581) stable |
| Tue, 13 Mar 2012 16:29:13 -0500 | Matt Mackall | merge with stable |
| Tue, 13 Mar 2012 15:12:26 -0500 | Matt Mackall | filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 stable |
| Thu, 01 Mar 2012 17:45:13 +0100 | Thomas Arendsen Hein | merge with stable |