equal
deleted
inserted
replaced
1 This test makes sure that we don't mark a file as merged with its ancestor |
1 This test makes sure that we don't mark a file as merged with its ancestor |
2 when we do a merge. |
2 when we do a merge. |
3 |
3 |
4 $ cat <<EOF > merge |
4 $ cat <<EOF > merge |
5 > from __future__ import print_function |
|
6 > import sys, os |
5 > import sys, os |
7 > print("merging for", os.path.basename(sys.argv[1])) |
6 > print("merging for", os.path.basename(sys.argv[1])) |
8 > EOF |
7 > EOF |
9 $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE |
8 $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE |
10 |
9 |