gistfile1.txt

./t3509-cherry-pick-merge-df.sh -v --debug -i
Cleaning trash directory.t3509-cherry-pick-merge-df
Initialized empty Git repository in c:/Projects/msysgit/git/t/trash directory.t3
509-cherry-pick-merge-df/.git/
expecting success:
        mkdir a &&
        >a/f &&
        git add a &&
        git commit -m a

[master (root-commit) 27f4754] a
 Author: A U Thor <[email protected]>
 0 files changed
 create mode 100644 a/f
ok 1 - Initialize repository

expecting success:
        mkdir b &&
        ln -s ../a b/a &&
        git add b &&
        git commit -m b &&

        git checkout -b branch &&
        rm_symlink b/a &&
        mv a b/a &&
        ln -s b/a a &&
        git add . &&
        git commit -m swap &&

        >f1 &&
        git add f1 &&
        git commit -m f1

[master 54118eb] b
 Author: A U Thor <[email protected]>
 0 files changed
 create mode 100644 b/a/f
Switched to a new branch 'branch'
# On branch branch
nothing to commit (working directory clean)
not ok - 2 Setup rename across paths each below D/F conflicts
#
#               mkdir b &&
#               ln -s ../a b/a &&
#               git add b &&
#               git commit -m b &&
#
#               git checkout -b branch &&
#               rm_symlink b/a &&
#               mv a b/a &&
#               ln -s b/a a &&
#               git add . &&
#               git commit -m swap &&
#
#               >f1 &&
#               git add f1 &&
#               git commit -m f1
#