| Mon, 23 Nov 2015 13:43:14 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add a file with regular merge conflicts
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
| Fri, 27 Nov 2015 20:23:23 +0100 |
Mathias De Maré |
identify: refer to log to be able to view full hashes
|
| Fri, 27 Nov 2015 20:23:02 +0100 |
Mathias De Maré |
log: add 'hg log' example for full hashes
|
| Fri, 02 Oct 2015 07:48:23 +0200 |
Mathias De Maré |
backout: add examples to clarify basic usage
|
| Wed, 25 Nov 2015 06:10:54 +0000 |
timeless |
gpg: rename sigcheck function
|
| Tue, 24 Nov 2015 18:40:16 -0500 |
Augie Fackler |
extensions: properly mark progress as part of core
|
| Fri, 27 Nov 2015 23:10:48 +0900 |
Yuya Nishihara |
test-help: don't use progress extension for the test of argument parsing
|
| Tue, 24 Nov 2015 22:31:56 +0000 |
timeless |
hghave.py: fix matchoutput documentation
|
| Tue, 24 Nov 2015 14:23:46 -0800 |
Gregory Szorc |
dispatch: use versiontuple()
|
| Tue, 24 Nov 2015 14:23:51 -0800 |
Gregory Szorc |
util: add versiontuple() for returning parsed version information
|
| Tue, 24 Nov 2015 16:38:54 -0800 |
Bryan O'Sullivan |
extensions: rename _ignore to _builtin, add descriptive comment
|
| Sun, 22 Nov 2015 14:44:55 -0800 |
Gregory Szorc |
ui: avoid needless casting to a str
|
