Thomas Arendsen Hein 20e6210ce8 Fix 3-way-merge of original parent, workdir and new parent. ... The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.		2005-08-10 06:47:46 +01:00
..
__init__.py	Add back links from file revisions to changeset revisions	2005-05-03 13:16:10 -08:00
bdiff.c	Fix array overflow bug in bdiff	2005-08-04 13:25:59 -08:00
byterange.py	Make consistent use of str.startswith() in conditionals.	2005-07-10 16:14:56 -08:00
commands.py	Allow HG patch to appear late in the input stream	2005-08-06 21:23:38 +01:00
demandload.py	implement demand loading hack	2005-06-05 10:48:39 -08:00
fancyopts.py	A number of minor fixes to problems that pychecker found.	2005-07-10 16:01:11 -08:00
hg.py	Fix 3-way-merge of original parent, workdir and new parent.	2005-08-10 06:47:46 +01:00
hgweb.py	[PATCH] Move default page name into map file	2005-08-08 19:49:48 -08:00
httprangereader.py	Move httprangereader into its own file	2005-06-15 19:58:48 -08:00
lock.py	Make makelock and readlock work on filesystems without symlink support.	2005-07-14 22:51:47 +01:00
mdiff.py	Remove all remaining print statements	2005-07-02 18:57:59 -08:00
mpatch.c	[PATCH] use <arpa/inet.h> instead of <netinet/in.h> for ntohl/htonl	2005-07-03 12:26:45 -08:00
revlog.py	Fixed revlog.children.	2005-08-06 21:58:28 +01:00
transaction.py	Fix undo after aborted commit bug	2005-07-27 18:16:20 -08:00
ui.py	HG environment variables take precedence over hgrc	2005-07-13 01:48:03 -08:00
util.py	Clean up walk and changes code to use normalised names properly.	2005-07-31 17:42:46 -08:00
version.py	[PATCH] /dev/null for other OS	2005-06-24 22:58:14 -08:00