| Wed, 11 Oct 2006 16:35:09 +0200 |
Benoit Boissinot |
fix traceback of extdiff after a merge
|
| Tue, 10 Oct 2006 14:48:26 -0700 |
Brendan Cully |
Don't generate git diff header for empty diffs
|
| Tue, 10 Oct 2006 10:54:22 -0700 |
Brendan Cully |
Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)
|
| Tue, 10 Oct 2006 10:28:20 -0700 |
Brendan Cully |
NWI base URL detection fixes
|
| Tue, 10 Oct 2006 11:47:19 +0200 |
Thomas Arendsen Hein |
merge with upstream
|
| Tue, 10 Oct 2006 03:39:44 -0500 |
Matt Mackall |
merge: pull user messages out to hg.py
|
| Tue, 10 Oct 2006 02:31:02 -0500 |
Matt Mackall |
merge: update some docstrings
|
| Tue, 10 Oct 2006 09:30:05 +0200 |
Thomas Arendsen Hein |
merge with upstream
|
| Tue, 10 Oct 2006 02:15:20 -0500 |
Matt Mackall |
merge: various tidying
|
| Tue, 10 Oct 2006 02:11:59 -0500 |
Matt Mackall |
context: change workingctx str() from . to <node>+
|
| Tue, 10 Oct 2006 01:43:58 -0500 |
Matt Mackall |
merge: use contexts in checkunknown and forgetremoved
|
| Tue, 10 Oct 2006 01:16:06 -0500 |
Matt Mackall |
merge: shortcircuit filemerge for identical files
|
| Tue, 10 Oct 2006 01:13:03 -0500 |
Matt Mackall |
context: add cmp for filectxs
|
| Tue, 10 Oct 2006 00:54:00 -0500 |
Matt Mackall |
merge: pull file copy/move out of filemerge
|
| Tue, 10 Oct 2006 00:41:55 -0500 |
Matt Mackall |
merge: unify merge and copy actions
|
