X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft1001-read-tree-m-2way.sh;h=d0ed24275e593e0decd2cdaf46617d5c3fc876e3;hb=3e9fabc85ef44fa0f275dd89738a2dacb7b6f5db;hp=5b69681c520afc3f4838dc0540637260fa9f20fc;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 5b69681c..d0ed2427 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -11,7 +11,7 @@ There is the head (called H) and another commit (called M), which is simply ahead of H. The index and the work tree contains a state that is derived from H, but may also have local changes. This test checks all the combinations described in the two-tree merge "carry forward" -rules, found in . +rules, found in . In the test, these paths are used: bozbar - in H, stays in M, modified from bozbar to gnusto