git checkout A^0 &&
- test-tool chmtime =-1 b &&
- test-tool chmtime --get b >old-mtime &&
+ test-tool chmtime --get -3600 b >old-mtime &&
GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
git checkout B^0 &&
- test-tool chmtime =-1 b &&
- test-tool chmtime --get b >old-mtime &&
+ test-tool chmtime --get -3600 b >old-mtime &&
GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
# Make sure b WAS updated
git checkout B^0 &&
- test-tool chmtime =-1 c &&
- test-tool chmtime --get c >old-mtime &&
+ test-tool chmtime --get -3600 c >old-mtime &&
GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
# Make sure c WAS updated
git checkout A^0 &&
- test-tool chmtime =-1 c &&
- test-tool chmtime --get c >old-mtime &&
+ test-tool chmtime --get -3600 c >old-mtime &&
GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
test_must_be_empty err &&
git checkout A^0 &&
- test-tool chmtime =-1 c &&
- test-tool chmtime --get c >old-mtime &&
+ test-tool chmtime --get -3600 c >old-mtime &&
GIT_MERGE_VERBOSITY=3 &&
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge -s recursive B^0 >out 2>err &&
git checkout A^0 &&
echo "File rewritten" >b &&
- test-tool chmtime =-1 b &&
- test-tool chmtime --get b >old-mtime &&
+ test-tool chmtime --get -3600 b >old-mtime &&
GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
git checkout A^0 &&
echo "File rewritten" >c &&
- test-tool chmtime =-1 c &&
- test-tool chmtime --get c >old-mtime &&
+ test-tool chmtime --get -3600 c >old-mtime &&
GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&