3 test_description
='basic work tree status reporting'
7 test_expect_success setup
'
9 test_commit B oneside added &&
11 test_commit C oneside created
14 test_expect_success
'A/A conflict' '
16 test_must_fail git merge C
19 test_expect_success
'Report path with conflict' '
20 git diff --cached --name-status >actual &&
21 echo "U oneside" >expect &&
22 test_cmp expect actual
25 test_expect_success
'Report new path with conflict' '
26 git diff --cached --name-status HEAD^ >actual &&
27 echo "U oneside" >expect &&
28 test_cmp expect actual