Mercurial > hg
log tests/test-merge-remove.t @ 39285:a3fd84f4fb38
age | author | description |
---|---|---|
Sun, 26 Aug 2018 19:14:26 +0300 | Pulkit Goyal | filemerge: fix the wrong placements of messages in prompt |
Sat, 25 Aug 2018 21:17:34 +0300 | Pulkit Goyal | filemerge: print the filename in quotes in prompt |
Mon, 20 Aug 2018 13:29:48 -0400 | Augie Fackler | merge: improve interactive one-changed one-deleted message (issue5550) |
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 |
Fri, 12 Aug 2016 05:56:40 -0700 | Simon Farnsworth | merge: always use other, not remote, in user prompts |