Wed, 11 Nov 2015 15:08:08 -0600 | Matt Mackall | merge with stable | changeset | files |
Wed, 04 Nov 2015 12:14:18 -0500 | Augie Fackler | verify: add a hook that can let extensions manipulate file lists | changeset | files |
Tue, 10 Nov 2015 17:16:59 -0800 | Siddharth Agarwal | resolve: don't abort when file is missing | changeset | files |
Tue, 10 Nov 2015 17:13:16 -0800 | Siddharth Agarwal | filemerge: treat EOF at prompt as fail, not abort | changeset | files |
Tue, 10 Nov 2015 17:10:47 -0800 | Siddharth Agarwal | test-merge-tools.t: add 'hg resolve --list' output to tests | changeset | files |
Tue, 10 Nov 2015 00:46:45 -0800 | Siddharth Agarwal | error: add structured exception for EOF at prompt | changeset | files |
Mon, 09 Nov 2015 22:37:32 -0800 | Siddharth Agarwal | test-merge-prompt.t: unset HGMERGE | changeset | files |
Tue, 10 Nov 2015 23:02:59 +0800 | Anton Shestakov | hgweb: compute changeset parents and children for log pages lazily | changeset | files |