equal
deleted
inserted
replaced
1 |
1 |
2 $ mkdir -p t |
2 $ mkdir -p t |
3 $ cd t |
3 $ cd t |
4 $ cat <<EOF > merge |
4 $ cat <<EOF > merge |
5 > import sys, os |
5 > import sys, os |
6 > f = open(sys.argv[1], "wb") |
6 > f = open(sys.argv[1], "w") |
7 > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3])) |
7 > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3])) |
8 > f.close() |
8 > f.close() |
9 > EOF |
9 > EOF |
10 |
10 |
11 perform a test merge with possible renaming |
11 perform a test merge with possible renaming |