| changeset 547 | 4fc63e22b1fe |
| parent 306 | f06a4a3b86a7 |
| parent 544 | 3d4d5f2aba9a |
| child 795 | cd0ad12d9e42 |
| child 808 | 8f5637f0a0c0 |
| child 814 | 0902ffece4b4 |
| 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. |