Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 18257:a35d0128545e
age | author | description |
---|---|---|
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 |