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 |