Mercurial > hg > gitweb

diff tkmerge @ 0:9117c6561b0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add back links from file revisions to changeset revisions Add simple transaction support Add hg verify Improve caching in revlog Fix a bunch of bugs Self-hosting now that the metadata is close to finalized
author mpm@selenic.com
date Tue, 03 May 2005 13:16:10 -0800
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tkmerge	Tue May 03 13:16:10 2005 -0800
@@ -0,0 +1,2 @@
+merge $1 $3 $2 || tkdiff -conflict $1 -o $1
+