Mercurial > hg > pyhgsh

view tkmerge @ 181:038e4d8602bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for .hgpaths and http/old-http protocol name change
author jake@edge2.net
date Fri, 27 May 2005 14:09:43 -0700
parents 9117c6561b0b
children
line wrap: on
line source

merge $1 $3 $2 || tkdiff -conflict $1 -o $1