Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-empty-dir.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 11 Mar 2006 21:33:19 -0800
changeset 1885 c4d577262d00
parent 925 5a034646e472
child 1926 ba198d17eea9
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset 
     1
 
321
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset 
     2
 
cat: sub/b: No such file or directory
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset 
     3
 
ls: sub: No such file or directory
mercurial-crew-with-dirclash