Mercurial > hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 479: (0) -240 +240 +1000 +3000 +10000 +30000 tip
age author description
Sun, 26 Jun 2005 14:14:04 +0100 Thomas Arendsen Hein Cleaned up command alias handling in help.
Sun, 26 Jun 2005 13:49:27 +0100 Thomas Arendsen Hein Update of doc/hg.1.txt
Sun, 26 Jun 2005 13:25:07 +0100 Thomas Arendsen Hein Handle errors in .hgtags or hgrc [tags] section more gracefully.
Sun, 26 Jun 2005 12:04:59 +0100 Thomas Arendsen Hein Really _call_ method revlog.count in revlog.lookup()
Sun, 26 Jun 2005 11:33:16 +0100 Thomas Arendsen Hein Fixed diff generation in hgeditor if a list of files is given to hg commit.
Sun, 26 Jun 2005 15:09:37 -0800 mpm Minor speed improvements for bdiff
Sat, 25 Jun 2005 16:31:43 -0800 mpm [PATCH] Get run-tests working on 64-bit machines.
Sat, 25 Jun 2005 16:18:40 -0800 mpm extensions: use stdint.h
Sat, 25 Jun 2005 16:17:34 -0800 mpm Minor annotate performance tweaks
Sat, 25 Jun 2005 00:16:39 -0800 mpm Fix up version module name and command conflict
Fri, 24 Jun 2005 23:50:27 -0800 mpm Various node id lookup tweaks
Fri, 24 Jun 2005 23:22:46 -0800 mpm [PATCH] add "root" command
Fri, 24 Jun 2005 23:20:30 -0800 mpm Add version command
Fri, 24 Jun 2005 23:17:10 -0800 mpm Add hgmerge manpage
Fri, 24 Jun 2005 23:15:50 -0800 mpm Add a doc makefile
Fri, 24 Jun 2005 23:07:16 -0800 mpm Merge from http://moffetthome.net:8012/
Fri, 24 Jun 2005 20:53:51 -0500 kyle Added stdint.h include to fix build on Mac OS X Tiger [v10.4]
Fri, 24 Jun 2005 23:00:19 -0800 mpm Fix pipe timing for copy test
Fri, 24 Jun 2005 22:58:14 -0800 mpm [PATCH] /dev/null for other OS
Fri, 24 Jun 2005 22:51:39 -0800 mpm add dirstate debugging commands
Fri, 24 Jun 2005 22:44:51 -0800 mpm Add an RPM spec file
Fri, 24 Jun 2005 12:33:14 -0800 mpm Added tag 0.6 for changeset 12e0fdbc57a0be78f0e817fd1d170a3615cd35da
Fri, 24 Jun 2005 12:28:09 -0800 mpm Release tweaks 0.6
Thu, 23 Jun 2005 21:46:02 -0800 mpm More FAQ bits.
Thu, 23 Jun 2005 18:49:38 -0800 mpm More FAQ updates
Thu, 23 Jun 2005 18:48:50 -0800 mpm Add 'local' tags
Thu, 23 Jun 2005 17:51:03 -0800 mpm Clarify doc/README a bit
Thu, 23 Jun 2005 17:43:04 -0800 mpm rawcommit: do lookup of parents at the appropriate layer
Thu, 23 Jun 2005 17:37:47 -0800 mpm Make lookup a bit smarter
Thu, 23 Jun 2005 17:33:07 -0800 mpm Get set_exec from util in convert_repo
Thu, 23 Jun 2005 14:12:57 -0800 mpm Cleaned up some asciidoc bits in the FAQ
Thu, 23 Jun 2005 13:51:22 -0800 mpm Minor packaging fixups
Thu, 23 Jun 2005 13:49:54 -0800 mpm Update TODO
Thu, 23 Jun 2005 13:48:44 -0800 mpm The beginnings of a FAQ file
Thu, 23 Jun 2005 13:48:06 -0800 mpm README tidy-up
Thu, 23 Jun 2005 13:34:13 -0800 mpm Add rawcommit tests
Thu, 23 Jun 2005 13:29:35 -0800 mpm hg import error checking
Thu, 23 Jun 2005 13:28:47 -0800 mpm rawcommit dirstate tweak
Thu, 23 Jun 2005 09:33:18 -0800 mpm Permission handling for the other OS
Thu, 23 Jun 2005 09:26:43 -0800 mpm Fix up tests for command name changes
Thu, 23 Jun 2005 09:22:30 -0800 mpm Use __inline instead of inline
Wed, 22 Jun 2005 22:33:30 -0800 mpm Update docs
Wed, 22 Jun 2005 22:31:25 -0800 mpm Commands cleanup
Wed, 22 Jun 2005 12:14:44 -0800 mpm Optimize annotate a bit
Wed, 22 Jun 2005 11:31:24 -0800 mpm Fix a compile warning for bdiff
Wed, 22 Jun 2005 11:30:14 -0800 mpm Replace difflib with bdiff for annotate
Wed, 22 Jun 2005 11:27:50 -0800 mpm Add bdiff.blocks / minor performance tweaks
Wed, 22 Jun 2005 11:23:01 -0800 mpm Start using bdiff for generating deltas
Wed, 22 Jun 2005 11:21:04 -0800 mpm convert-repo fixups
Tue, 21 Jun 2005 21:07:08 -0800 mpm Fix up test-merge1
Tue, 21 Jun 2005 21:04:49 -0800 mpm Pull from TAH
Tue, 21 Jun 2005 20:40:53 -0800 mpm Fix typo in merging new files
Sun, 19 Jun 2005 21:04:32 +0100 Thomas Arendsen Hein Make it possible to specify a version number in setup.py.
Sun, 19 Jun 2005 20:16:10 +0100 Thomas Arendsen Hein Allow hgrc's proxy host and $http_proxy env var to start with http://
Sun, 19 Jun 2005 14:21:38 +0100 Thomas Arendsen Hein remember_version() only writes version if called in a Mercurial repository.
Sat, 18 Jun 2005 21:56:31 +0100 Thomas Arendsen Hein Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work.
Sat, 18 Jun 2005 16:32:41 +0100 Thomas Arendsen Hein Support for 'hg --version'. setup.py stores version from hg repository.
Tue, 21 Jun 2005 19:43:40 -0800 mpm [PATCH] Enables lock work under the other 'OS'
Tue, 21 Jun 2005 19:36:35 -0800 mpm [PATCH] rename under the other OS
Tue, 21 Jun 2005 19:33:13 -0800 mpm [PATCH] Repo locator fix for the other `OS'
Tue, 21 Jun 2005 19:31:13 -0800 mpm [PATCH] file seperator handling for the other 'OS'
Tue, 21 Jun 2005 19:28:53 -0800 mpm Minor tweak to binary mode patch
Tue, 21 Jun 2005 19:25:05 -0800 mpm [PATCH] file type fixes for the other 'OS'
Tue, 21 Jun 2005 19:19:39 -0800 mpm [PATCH] Removal of a file added by merging branches
Tue, 21 Jun 2005 19:14:11 -0800 mpm [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
Tue, 21 Jun 2005 19:12:56 -0800 mpm Fix ls output for test-flags
Tue, 21 Jun 2005 19:07:13 -0800 mpm remove double assignment
Tue, 21 Jun 2005 19:06:17 -0800 mpm [PATCH]: Typo in localrepository.update
Tue, 21 Jun 2005 18:54:44 -0800 mpm Add 'other OS' bits to bdiff.c / style cleanups
Tue, 21 Jun 2005 18:51:46 -0800 mpm Make mpatch.c compilable under the other `OS'
Tue, 21 Jun 2005 18:51:06 -0800 mpm Pick up tests from previous patch
Tue, 21 Jun 2005 18:48:28 -0800 mpm [PATCH] Merging files that are deleted in both branches
Tue, 21 Jun 2005 18:41:57 -0800 mpm [PATCH] Merging identical changes from another branch
Tue, 21 Jun 2005 18:35:32 -0800 mpm [PATCH] Using monotone-viz/git-viz with mercurial
Tue, 21 Jun 2005 18:29:52 -0800 mpm Check if repository exists
Tue, 21 Jun 2005 18:04:25 -0800 mpm [PATCH] Unintuive use
Tue, 21 Jun 2005 17:53:01 -0800 mpm [PATCH] rawcommit fix again
Tue, 21 Jun 2005 17:50:37 -0800 mpm [PATCH] (3/4) Removing an added file
Tue, 21 Jun 2005 17:47:28 -0800 mpm From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Tue, 21 Jun 2005 17:27:58 -0800 mpm Add a fast binary diff extension (not yet used)
Tue, 21 Jun 2005 17:24:41 -0800 mpm Delete error logs one test at a time
Tue, 21 Jun 2005 17:21:56 -0800 mpm Quiet successful test install in run-tests
Tue, 21 Jun 2005 17:19:12 -0800 mpm From: Andrew Thompson <andrewkt@aktzero.com>
Fri, 17 Jun 2005 20:37:23 +0100 Thomas Arendsen Hein Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Fri, 17 Jun 2005 11:03:44 -0800 mpm commands: report http exceptions nicely
Fri, 17 Jun 2005 09:32:13 -0800 mpm Add COPYING
Fri, 17 Jun 2005 09:03:22 -0800 mpm hg init: add -u flag to update
Fri, 17 Jun 2005 08:50:55 -0800 mpm Tidy up conflict and pull tests
Fri, 17 Jun 2005 08:50:11 -0800 mpm hgweb: pull cgitb into CGI script example, where it can easily be disabled
Fri, 17 Jun 2005 15:05:32 +0100 Thomas Arendsen Hein create .hg/hgrc with [paths] default entry only if source was given on hg init.
Fri, 17 Jun 2005 14:56:28 +0100 Thomas Arendsen Hein Updated TODO
Fri, 17 Jun 2005 11:03:03 +0100 Thomas Arendsen Hein Fixed tests for displaying tags in hg history and hg parents.
Fri, 17 Jun 2005 10:30:46 +0100 Thomas Arendsen Hein Show tags in hg history etc.
Fri, 17 Jun 2005 10:19:43 +0100 Thomas Arendsen Hein Improvements for hg identify:
Fri, 17 Jun 2005 10:16:31 +0100 Thomas Arendsen Hein Fixed problems with extra spaces around tags in .hgtags
Thu, 16 Jun 2005 22:54:37 -0800 mpm mpatch: attempt to handle unpack alignment issues on Solaris
Thu, 16 Jun 2005 22:32:55 -0800 mpm hg merge: fix time asymmetry bug with deleting files on update to past
Thu, 16 Jun 2005 08:37:15 -0800 mpm test suite: fix timezone problems and port collision problem
Thu, 16 Jun 2005 00:39:30 -0800 mpm Ancestor algorithm fix
Wed, 15 Jun 2005 21:23:07 -0800 mpm Merge with TAH
Thu, 16 Jun 2005 06:22:14 +0100 Thomas Arendsen Hein Updated TODO
Wed, 15 Jun 2005 21:18:35 -0800 mpm hgweb: missed a long hash
Wed, 15 Jun 2005 21:13:49 -0800 mpm Merge with TAH
Thu, 16 Jun 2005 05:44:05 +0100 Thomas Arendsen Hein hgweb: fix deleted file in filediff key error
Wed, 15 Jun 2005 21:13:08 -0800 mpm Show nice short hashes in hgweb
Wed, 15 Jun 2005 21:12:28 -0800 mpm update tests to reflect new short hash length
Wed, 15 Jun 2005 21:11:40 -0800 mpm Change the size of the short hash representation
Wed, 15 Jun 2005 19:58:48 -0800 mpm Move httprangereader into its own file
Wed, 15 Jun 2005 19:52:41 -0800 mpm hg push: "default-push" default target path
Wed, 15 Jun 2005 19:48:04 -0800 mpm revlog: add a children function
Wed, 15 Jun 2005 19:23:09 -0800 mpm hgweb: fix deleted file in changeset key error
Wed, 15 Jun 2005 17:35:09 -0800 mpm Add a TODO list
Wed, 15 Jun 2005 17:18:06 -0800 mpm Use errno.EPIPE rather than 32
Wed, 15 Jun 2005 17:15:38 -0800 mpm hgweb: remove pointless manifest reads
Wed, 15 Jun 2005 15:58:53 -0800 mpm One too many newlines in verbose output showed up in regression
Wed, 15 Jun 2005 15:58:11 -0800 mpm test-help: hg copy now shows up in the help
Wed, 15 Jun 2005 15:57:07 -0800 mpm Add hg copy
Wed, 15 Jun 2005 15:50:28 -0800 mpm run-tests: run tests given on the command line
Wed, 15 Jun 2005 15:49:20 -0800 mpm Fix another sortdiff cornercase
Wed, 15 Jun 2005 13:04:05 -0800 mpm filelog: add metadata support
Wed, 15 Jun 2005 10:20:26 -0800 mpm hgweb: add file permissions
Wed, 15 Jun 2005 10:06:40 -0800 mpm [PATCH] manifest.readflags performance buglet
Wed, 15 Jun 2005 10:05:45 -0800 mpm [PATCH] Update hgit to the new commands.dodiff parameters
Wed, 15 Jun 2005 10:04:42 -0800 mpm hgit rev-list support
Wed, 15 Jun 2005 10:02:41 -0800 mpm hg import: better file accounting
Wed, 15 Jun 2005 10:01:15 -0800 mpm hg commit: add -A flag
Wed, 15 Jun 2005 10:00:10 -0800 mpm hg addremove: take optional files list
Wed, 15 Jun 2005 09:50:00 -0800 mpm ignore files associated with quilt
Wed, 15 Jun 2005 00:50:44 -0800 mpm hgweb: change number navigation tidy up
Wed, 15 Jun 2005 00:33:57 -0800 mpm Merge with TAH
Wed, 15 Jun 2005 08:32:29 +0100 Thomas Arendsen Hein Merged with mercurial-identify (which includes upstream's current tip)
Tue, 14 Jun 2005 08:49:52 +0100 Thomas Arendsen Hein Improved hgeditor:
Tue, 14 Jun 2005 08:01:18 +0100 Thomas Arendsen Hein Cleaned up show_changeset()
Wed, 15 Jun 2005 00:27:20 -0800 mpm merge3: fix argument order
Wed, 15 Jun 2005 00:10:18 -0800 mpm Add a tags/identify test group
Wed, 15 Jun 2005 00:09:19 -0800 mpm Fix yet another resolve corner case
Wed, 15 Jun 2005 00:08:03 -0800 mpm rework all code using tags
Wed, 15 Jun 2005 00:03:25 -0800 mpm update help test for identify
Wed, 15 Jun 2005 00:02:13 -0800 mpm run-tests: actually mark changed output as failure
Wed, 15 Jun 2005 07:07:05 +0100 Thomas Arendsen Hein Handle the case where the current working copy is not based on a checkout.
Wed, 15 Jun 2005 06:44:43 +0100 Thomas Arendsen Hein added hg identify|id (based on a patch from Andrew Thompson)
Tue, 14 Jun 2005 18:37:53 -0800 mpm default path support with .hg/hgrc
Tue, 14 Jun 2005 18:36:09 -0800 mpm Add support for .hg/hgrc file
Tue, 14 Jun 2005 17:30:56 -0800 mpm Add some more tests
Tue, 14 Jun 2005 17:06:57 -0800 mpm Fix misrecognition of commands
Tue, 14 Jun 2005 14:04:15 -0800 mpm hgit: remove tabs
Tue, 14 Jun 2005 13:53:22 -0800 mpm hg rawcommit: fix files arg conflict
Tue, 14 Jun 2005 13:44:37 -0800 mpm testing fixups
Tue, 14 Jun 2005 13:28:42 -0800 mpm Add a simple testing framework
Mon, 13 Jun 2005 18:36:40 -0800 mpm Merge with TAH
Mon, 13 Jun 2005 08:49:21 +0100 Thomas Arendsen Hein Use common output function show_changeset() for hg heads|history|log|tip.
Mon, 13 Jun 2005 17:29:04 -0800 mpm hg pull: more query fixes
Mon, 13 Jun 2005 15:01:38 -0800 mpm Tweak README for branch, push, and .hgrc
Mon, 13 Jun 2005 14:53:33 -0800 mpm mdiff: fix the fix
Mon, 13 Jun 2005 13:43:48 -0800 mpm mdiff: reinstate new algorithm
Mon, 13 Jun 2005 12:04:04 -0800 mpm hg merge: some getchangegroup fixups
Mon, 13 Jun 2005 12:01:12 -0800 mpm lazyparser speed ups
Mon, 13 Jun 2005 11:58:33 -0800 mpm hgweb: Fix reloading of index
Sun, 12 Jun 2005 22:05:08 -0800 mpm Transparent proxy support
Sun, 12 Jun 2005 20:39:08 -0800 mpm hg push: propagate return code
Sun, 12 Jun 2005 19:35:41 -0800 mpm stopgap hg push support
Sun, 12 Jun 2005 10:20:07 -0800 mpm mdiff: revert grouping optimization for the time being
Sun, 12 Jun 2005 10:18:32 -0800 mpm hg commit: user and date options
Sun, 12 Jun 2005 08:51:11 -0800 mpm Add new convert-repo script
Sun, 12 Jun 2005 08:49:49 -0800 mpm Remove the old convert-repo script for .4-era hg repositories
Sun, 12 Jun 2005 08:48:01 -0800 mpm More tweaking to rawcommit for repo conversion
Sun, 12 Jun 2005 08:23:29 -0800 mpm Minor caching improvement for manifest
Sun, 12 Jun 2005 08:11:43 -0800 mpm Optimize diff and status in subdirectories
Sat, 11 Jun 2005 10:10:06 -0800 mpm fix KeyErrors from reading empty dirstate
Fri, 10 Jun 2005 14:10:07 -0800 mpm hg patch: add default commit text
Fri, 10 Jun 2005 13:48:08 -0800 mpm add easy profiling support
Fri, 10 Jun 2005 12:49:25 -0800 mpm Add tip to tags
Fri, 10 Jun 2005 12:48:12 -0800 mpm add tip to repo.lookup
Fri, 10 Jun 2005 09:36:38 -0800 mpm Merge with TAH
Fri, 10 Jun 2005 09:36:02 -0800 mpm more merge fixes
Fri, 10 Jun 2005 07:52:39 +0100 Thomas Arendsen Hein Use vi if $EDITOR is unset.
Fri, 10 Jun 2005 07:50:20 +0100 Thomas Arendsen Hein Check if $DISPLAY is set before using tkdiff or kdiff3.
Fri, 10 Jun 2005 00:29:36 -0800 mpm various fixups for git import
Fri, 10 Jun 2005 00:26:29 -0800 mpm revlog: allow duplicates
Fri, 10 Jun 2005 00:25:04 -0800 mpm hg init: when hardlinking, remove dirstate
Thu, 09 Jun 2005 09:48:50 -0800 mpm Merge with TAH
Thu, 09 Jun 2005 09:24:08 +0100 Thomas Arendsen Hein Turn on +x for every +r bit when making a file executable and obey umask.
Thu, 09 Jun 2005 08:53:07 +0100 Thomas Arendsen Hein Fixed usage of removed variable 'wp'.
Thu, 09 Jun 2005 09:41:21 -0800 mpm hg update: fix clobbering files when going backwards
Wed, 08 Jun 2005 22:03:18 -0800 mpm Fix hg import fix
Wed, 08 Jun 2005 21:22:38 -0800 mpm hg patch: fix to actually take a list of patches
Wed, 08 Jun 2005 20:11:57 -0800 mpm hg help improvements
Wed, 08 Jun 2005 17:38:46 -0800 mpm Make most file opening binary
Wed, 08 Jun 2005 17:26:09 -0800 mpm Add wopener for opening files in the working directory
Wed, 08 Jun 2005 17:08:55 -0800 mpm replace hg branch with hg init [source]
Wed, 08 Jun 2005 16:28:34 -0800 mpm hg commit: add -t and -l options
Wed, 08 Jun 2005 16:27:03 -0800 mpm commit: edit text fixups
Wed, 08 Jun 2005 16:15:07 -0800 mpm commit: abort with empty commit text
Wed, 08 Jun 2005 14:46:34 -0800 mpm hg pull: ditch .hgpaths for new .hgrc
Wed, 08 Jun 2005 14:45:06 -0800 mpm ui: add configuration file support
Wed, 08 Jun 2005 14:44:32 -0800 mpm verify: don't die from new permission bits
Wed, 08 Jun 2005 13:06:46 -0800 mpm minor hgk fixes
Wed, 08 Jun 2005 11:01:18 -0800 mpm mpatch: properly NULL out return in lalloc
Wed, 08 Jun 2005 10:59:18 -0800 mpm hg cat: relative file support
Wed, 08 Jun 2005 10:52:01 -0800 mpm Mark the usual things executable
Wed, 08 Jun 2005 10:50:50 -0800 mpm permissions merge: remove a debugging print
Wed, 08 Jun 2005 10:47:10 -0800 mpm unidiff: handle empty diffs more gracefully
Wed, 08 Jun 2005 10:46:39 -0800 mpm merge: update permissions even if file contents didn't change
Wed, 08 Jun 2005 10:16:33 -0800 mpm add tracking of execute permissions
Tue, 07 Jun 2005 20:06:05 -0800 mpm various merge improvements
Tue, 07 Jun 2005 19:02:31 -0800 mpm [PATCH] hgk should parse dates in the diff output
Tue, 07 Jun 2005 19:00:56 -0800 mpm merge: Fix bug where we overwrote local when local was newer
Tue, 07 Jun 2005 08:53:05 -0800 mpm diff: use tab to separate date from filename
Tue, 07 Jun 2005 00:21:53 -0800 mpm hgweb: ignore pipe errors
Tue, 07 Jun 2005 00:07:31 -0800 mpm Reverse order of hg log and hg history lists
Tue, 07 Jun 2005 00:04:43 -0800 mpm hgweb: shrink the default changelog list to 10
Tue, 07 Jun 2005 00:03:38 -0800 mpm unknown command fixups
Tue, 07 Jun 2005 00:00:56 -0800 mpm Initial import of hgit and hgk
Mon, 06 Jun 2005 23:57:00 -0800 mpm Fix argument processing for patch and rawcommit
Mon, 06 Jun 2005 10:52:19 -0800 mpm hgweb: fix non-existent source or destination for diff
Mon, 06 Jun 2005 10:51:09 -0800 mpm Attempt to make diff deal with null sources properly
Sun, 05 Jun 2005 10:50:03 -0800 mpm Fix empty repository transaction bug
Sun, 05 Jun 2005 10:48:39 -0800 mpm implement demand loading hack
Sun, 05 Jun 2005 10:42:52 -0800 mpm Update README
Sun, 05 Jun 2005 00:42:44 -0800 mpm Some tweaking of notes.txt
Sat, 04 Jun 2005 23:37:11 -0800 mpm fix addremove
Sat, 04 Jun 2005 20:02:27 -0800 mpm hgweb: watch changelog for changes
Sat, 04 Jun 2005 19:35:08 -0800 mpm Sort tags in revision order
Sat, 04 Jun 2005 19:21:13 -0800 mpm minor fixes for update()
Sat, 04 Jun 2005 19:09:00 -0800 mpm hg help: use docstrings only
Sat, 04 Jun 2005 18:34:35 -0800 mpm unify checkout and resolve into update
Sat, 04 Jun 2005 15:16:48 -0800 mpm Remove invalid state from dirstate
Sat, 04 Jun 2005 15:14:39 -0800 mpm Handle unknown commands nicely
Sat, 04 Jun 2005 15:14:11 -0800 mpm backup dirstate for undo
Sat, 04 Jun 2005 14:25:08 -0800 mpm Catch broken pipes in command interpreter
Sat, 04 Jun 2005 14:16:32 -0800 mpm import and startup cleanups
Sat, 04 Jun 2005 13:45:31 -0800 mpm migrate remaining commands
Sat, 04 Jun 2005 12:24:23 -0800 mpm migrate verify
Sat, 04 Jun 2005 12:14:14 -0800 mpm Migrate rawcommit, import, export, history, and merge
Sat, 04 Jun 2005 11:18:56 -0800 mpm big heap of command clean-up work
Sat, 04 Jun 2005 11:13:25 -0800 mpm root relative IO and valid commit states
Sat, 04 Jun 2005 11:10:42 -0800 mpm fix heads for rev 0
Fri, 03 Jun 2005 18:42:53 -0800 mpm hgmerge: use diff3 if available
Fri, 03 Jun 2005 18:29:46 -0800 mpm Resolve bits from TAH
Fri, 03 Jun 2005 18:27:55 -0800 mpm Replace tkmerge with hgmerge
less more | rev 479: (0) -240 +240 +1000 +3000 +10000 +30000 tip