tests/test-symlinks.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 11 Mar 2006 21:33:19 -0800
changeset 1885 c4d577262d00
parent 1620 6c61646fee5e
child 2115 fd77b7ee4aac
permissions -rw-r--r--
run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.

adding foo
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