Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 4e35843b2683 |
children | 9d1c3529ebbc |
line wrap: on
line source
(the addremove command is deprecated; use add and remove --after instead) adding foo (the addremove command is deprecated; use add and remove --after instead) adding bomb adding a.c adding dir/a.o adding dir/b.o ! a.c ! dir/a.o ! dir/b.o ? .hgignore a.c: unsupported file type (type is fifo) ! a.c # test absolute path through symlink outside repo A f # try symlink outside repo to file inside abort: ../z not under root