Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 52:c78eea339e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Strip trailing spaces from lsdiff file list
author mpm@selenic.com
date Wed, 11 May 2005 14:34:31 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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