Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tkmerge
author jake@edge2.net
Sat, 21 May 2005 16:21:16 -0700
changeset 134 13d609f8d830
parent 0 9117c6561b0b
permissions -rw-r--r--
fix problem with non wrapping file list fix file list not appearing in checkin

merge $1 $3 $2 || tkdiff -conflict $1 -o $1
mercurial-crew-with-dirclash