Mercurial > hg
comparison hgmerge @ 544:3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove bashisms and use /bin/sh instead of /bin/bash.
manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3
865XH6YVMuCYNjf3eibwQaM=
=r3gh
-----END PGP SIGNATURE-----
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 01 Jul 2005 07:22:27 +0100 |
| parents | f06a4a3b86a7 |
| children | 4fc63e22b1fe |
comparison
equal
deleted
inserted
replaced
| 543:61ead26cb8f0 | 544:3d4d5f2aba9a |
|---|---|
| 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. |