Thu, 11 Jan 2018 18:36:05 +0530 | Pulkit Goyal | evolve: use better words in conflict markers of `hg evolve` | changeset | files |
Thu, 11 Jan 2018 18:38:09 +0530 | Pulkit Goyal | tests: add a test demonstrating we still use graft in conflict markers | changeset | files |