Mercurial
Mercurial
>
hg-stable
/ 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-merge3.out
author
Matt Mackall <mpm@selenic.com>
Wed, 04 Oct 2006 19:08:04 -0500
changeset 3251
c93ce7f10f85
parent 1747
91c56c427171
permissions
-rw-r--r--
merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
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
removing b
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
775
diff
changeset
2
nothing changed