diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-28 19:39:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-28 19:39:26 -0700 |
| commit | 235db154f8b92e53b97ffb93725d394b6e20f398 (patch) | |
| tree | 18161aa7c30964c214969de1a8179831c6a9d9e9 /t | |
| parent | 4a224a9bbec4e7a1a4dcb7a91e663483dc477b78 (diff) | |
| parent | 3deffc52d88df73af72a80a406eb863880bb4d2a (diff) | |
| download | git-235db154f8b92e53b97ffb93725d394b6e20f398.tar.gz git-235db154f8b92e53b97ffb93725d394b6e20f398.tar.xz | |
Merge branch 'mm/reset-report'
* mm/reset-report:
reset: make the reminder output consistent with "checkout"
Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7102-reset.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index e637c7d4d..e85ff02c3 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -419,7 +419,8 @@ test_expect_success 'resetting an unmodified path is a no-op' ' ' cat > expect << EOF -file2: locally modified +Unstaged changes after reset: +M file2 EOF test_expect_success '--mixed refreshes the index' ' |