index 1a362d231a21a03673cc41281db12673363894e1..74161a42ec34c2d33780a80425ec1be5a4028f03 100755 (executable)
git commit -m "Add different B" &&
git clone ./. clone2 &&
git commit -m "Add different B" &&
git clone ./. clone2 &&
- (cd clone2 &&
- git checkout -b topic origin/topic &&
- test_must_fail git merge origin/master &&
- echo Resolved > B &&
- git add B &&
- git commit -m "Merge origin/master into topic"
+ (
+ cd clone2 &&
+ git checkout -b topic origin/topic &&
+ test_must_fail git merge origin/master &&
+ echo Resolved >B &&
+ git add B &&
+ git commit -m "Merge origin/master into topic"
) &&
git checkout topic &&
) &&
git checkout topic &&