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/docs
author
Pulkit Goyal <pulkit@yandex-team.ru>
Sat, 18 Aug 2018 21:03:45 +0530
branch
stable
changeset 3978
fb8e44c70798
parent 1103
d1ca81f9e458
permissions
-rw-r--r--
evolve: set the second parent if we get conflicts while evolving This patch makes sure we set the second parent correctly if we run into conflicts while evolving. Also, we need to make sure to reset to one parent before committing.
Ignore whitespace changes -
Everywhere:
Within whitespace:
At end of lines:
531
b18b00036355
pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff
changeset
1
html
1103
d1ca81f9e458
debian: add README to the list of documents shipped with the package.
Faheem Mitha <faheem@faheem.info>
parents:
531
diff
changeset
2
README