Mercurial > hg > mercurial-crew-with-dirclash
diff hgeditor @ 4007:20da40cc1c73
symlinks: minimal support for symlinks in merge/update
This will get angry, confused, and sad if you try to merge a symlink
with a regular file.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Dec 2006 20:04:31 -0600 |
parents | d9b8d28c0b94 |
children | 7a7d4937272b |