Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 547:4fc63e22b1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: 1742d7ba2093dc643b57e45167cb2d794212cbb9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxPCQywK+sNU5EO8RAkr0AJ9qut/31lCLQ/xY3FWaF3c21RhS7wCfW1eV 3WexPDsJldMAr3V5vc9eowA= =pJYu -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 23:28:16 -0800
parents f06a4a3b86a7 3d4d5f2aba9a
children cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
540:53872e2be33a 547:4fc63e22b1fe
1 #!/bin/bash 1 #!/bin/sh
2 # 2 #
3 # hgmerge - default merge helper for Mercurial 3 # hgmerge - default merge helper for Mercurial
4 # 4 #
5 # This tries to find a way to do three-way merge on the current system. 5 # This tries to find a way to do three-way merge on the current system.
6 # The result ought to end up in $1. 6 # The result ought to end up in $1.