Mercurial > hg > gitweb

view tkmerge @ 22:40b8c158c540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Document diff in help Add filenames to diff support
author mpm@selenic.com
date Wed, 04 May 2005 17:26:27 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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