| Mon, 24 Nov 2014 16:17:02 -0800 |
Martin von Zweigbergk |
merge: use None as filename for base in 'both created' conflicts
|
| Mon, 24 Nov 2014 16:42:36 -0800 |
Martin von Zweigbergk |
merge: break out "both renamed a -> b" case
|
| Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
| Mon, 24 Nov 2014 16:11:22 -0800 |
Martin von Zweigbergk |
merge: indent to prepare for next patch
|
| Tue, 25 Nov 2014 17:30:05 -0600 |
Matt Mackall |
merge with stable
|
| Tue, 25 Nov 2014 02:31:52 -0600 |
David Eckhardt |
factotum: convert Plan 9 quoted string to Python string
|
| Tue, 25 Nov 2014 02:27:31 -0600 |
Jeff Sickel |
plan9: setup check for current python build
|
| Wed, 19 Nov 2014 22:27:55 -0500 |
Matt Harbison |
add: check for the existence of a file matched inexactly before adding it
|
| Thu, 20 Nov 2014 22:33:40 -0500 |
Matt Harbison |
tests: choose the proper environment variable style for the platform
|
| Thu, 20 Nov 2014 20:07:34 -0500 |
Matt Harbison |
tests: fix another multi-statement hook for Windows
|
| Wed, 19 Nov 2014 23:41:40 -0500 |
Matt Harbison |
run-tests: set a default largefiles usercache in the default hgrc file
|
| Mon, 24 Nov 2014 09:50:27 -0800 |
Martin von Zweigbergk |
merge: remove obsolete check for untracked files in 'dm' action
|
| Sun, 23 Nov 2014 23:10:34 -0800 |
Martin von Zweigbergk |
merge: remove dead assignment in applyupdates()
|
| Fri, 21 Nov 2014 13:06:04 -0800 |
Martin von Zweigbergk |
merge: move calculateupdates() before applyupdated()
|
