Mercurial
Mercurial
>
hg
/ file revision
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 11 Oct 2006 16:35:09 +0200
changeset 3330
49966b5ab16f
parent 1747
91c56c427171
permissions
-rw-r--r--
fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
removing b
nothing changed