comparison .hgignore @ 3394:d1486760fb8d

tests: add a test demonstrating we still use graft in conflict markers This patch adds a test which shows that we still use the word graft in the conflict markers. Next patch will start using evolve instead of graft.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 11 Jan 2018 18:38:09 +0530
parents aad37ffd7d58
children ba316ce15040
comparison
equal deleted inserted replaced
3393:a29d063d09e1 3394:d1486760fb8d