Mercurial > hg
log tests/test-merge-remove.t @ 37753:f450a3be62ec
age | author | description |
---|---|---|
Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
Fri, 07 Oct 2016 08:51:50 -0700 | Simon Farnsworth | merge: add conflict labels to merge command |