Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:24:42 -0500] rev 1779
Merge with mpm
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:01:09 -0500] rev 1778
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 21:53:41 -0500] rev 1777
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net> [Tue, 14 Feb 2006 21:55:05 -0500] rev 1776
Merge
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 15:48:49 -0600] rev 1775
Merge with crew
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:22 -0600] rev 1774
hgmerge: add meld support
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:19 -0600] rev 1773
hgmerge: improve "apps not found" message
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:16 -0600] rev 1772
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:12 -0600] rev 1771
hgmerge: add and use ask_if_merged function
This patch, unlike the earlier ones, doesn't use unportable select builtin.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:09 -0600] rev 1770
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling