debian/docs
author Manuel Jacob <me@manueljacob.de>
Fri, 11 Oct 2019 21:32:27 +0200
branchstable
changeset 4998 88b816a9d990
parent 1103 d1ca81f9e458
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:
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