Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 65:d40cc5aacc31 0.4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up a bunch of bugs in the new merge code Move getchangegroup/addchangegroup to generators
author mpm@selenic.com
date Fri, 13 May 2005 11:47:16 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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