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-merge2.out
author
Vadim Gelfer <vadim.gelfer@gmail.com>
Sat, 11 Mar 2006 21:33:19 -0800
changeset 1885
c4d577262d00
parent 925
5a034646e472
child 2175
b2ae81a7df29
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:
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
1
adding b
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
2
adding b