Wed, 07 Feb 2018 13:49:02 +0530 |
Pulkit Goyal |
py3: make sure we open the file in bytes mode
|
Wed, 07 Feb 2018 13:34:51 +0530 |
Pulkit Goyal |
py3: add b'' prefixes to string literals in test files
|
Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
Thu, 03 Aug 2017 05:12:35 +0530 |
Pulkit Goyal |
morestatus: move fb extension to core by plugging to `hg status --verbose`
|
Wed, 05 Jul 2017 11:10:11 -0500 |
Augie Fackler |
tests: replace yet more calls to `python` with $PYTHON
|
Tue, 06 Jun 2017 22:17:39 +0530 |
Pulkit Goyal |
update: show the commit to which we updated in case of multiple heads (BC)
|
Sat, 25 Feb 2017 19:36:02 +0900 |
Yuya Nishihara |
filemerge: optionally strip quotes from merge marker template (BC)
|
Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
Wed, 10 Feb 2016 09:06:08 -0800 |
Ryan McElroy |
merge: minimize conflicts when common base is not shown (issue4447)
|
Tue, 02 Feb 2016 14:49:02 +0000 |
Pierre-Yves David |
update: warn about other topological heads on bare update
|
Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
Thu, 10 Sep 2015 09:41:11 -0400 |
Jordi GutiƩrrez Hermoso |
filemerge: add non-interactive :merge-local and :merge-other
|
Tue, 05 Aug 2014 14:58:45 -0700 |
Pierre-Yves David |
merge: add an internal:merge3 tool
|
Fri, 18 Jul 2014 21:49:52 -0500 |
Matt Mackall |
filemerge: use non-minimal conflict marker regions (BC)
|