Mercurial > hg > gitweb

view tkmerge @ 10:e76ed1e480ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix linking of changeset revs when merging
author oxymoron@cinder.waste.org
date Tue, 03 May 2005 23:37:43 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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