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
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Thu, 23 Feb 2006 18:10:04 +0100
changeset 1798
d610fe0e6893
parent 925
5a034646e472
child 2175
b2ae81a7df29
permissions
-rw-r--r--
hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
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