debian/compat
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 11 Jan 2018 18:36:05 +0530
changeset 3395 02192ac8ef98
parent 531 b18b00036355
child 4912 43e9bb4de6b5
permissions -rw-r--r--
evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.
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
8