Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ 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
.
debian/compat
author
Manuel Jacob <me@manueljacob.de>
Fri, 11 Oct 2019 21:32:27 +0200
branch
stable
changeset 4998
88b816a9d990
parent 4912
43e9bb4de6b5
permissions
-rw-r--r--
evolve: preserve date when resolving content-divergence (issue6202) This patch changes the implementation to do a 3 way merge. In case of actual conflict, it take the newest date from both sides of the content-divergence.
Ignore whitespace changes -
Everywhere:
Within whitespace:
At end of lines:
4912
43e9bb4de6b5
debian: update debhelper compat
Denis Laxalde <denis@laxalde.org>
parents:
531
diff
changeset
1
10