Mercurial Mercurial > hg > mercurial-crew-with-dirclash / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tkmerge
changeset 0 9117c6561b0b 
new file mode 100644
--- /dev/null
+++ b/tkmerge
@@ -0,0 +1,2 @@
+merge $1 $3 $2 || tkdiff -conflict $1 -o $1
+
mercurial-crew-with-dirclash