diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-21 12:48:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-21 12:48:59 -0700 |
| commit | 6dada01b95a48f8ea0eeec53d2eb4a8c894aff91 (patch) | |
| tree | f01007b557e99c4ec493374f58acd7883d4b0811 /t/t7060-wtstatus.sh | |
| parent | Merge branch 'jc/stash-pop-not-popped' (diff) | |
| parent | wt-status: lift the artificual "at least 20 columns" floor (diff) | |
| download | tgif-6dada01b95a48f8ea0eeec53d2eb4a8c894aff91.tar.xz | |
Merge branch 'jn/wt-status'
Unify the codepaths that format new/modified/changed sections and
conflicted paths in the "git status" output and make it possible to
properly internationalize their output.
* jn/wt-status:
wt-status: lift the artificual "at least 20 columns" floor
wt-status: i18n of section labels
wt-status: extract the code to compute width for labels
wt-status: make full label string to be subject to l10n
Diffstat (limited to 't/t7060-wtstatus.sh')
| -rwxr-xr-x | t/t7060-wtstatus.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 7d467c034a..741ec08576 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -38,7 +38,7 @@ You have unmerged paths. Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) - deleted by us: foo + deleted by us: foo no changes added to commit (use "git add" and/or "git commit -a") EOF @@ -142,8 +142,8 @@ You have unmerged paths. Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) - both added: conflict.txt - deleted by them: main.txt + both added: conflict.txt + deleted by them: main.txt no changes added to commit (use "git add" and/or "git commit -a") EOF @@ -175,9 +175,9 @@ You have unmerged paths. Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) - both deleted: main.txt - added by them: sub_master.txt - added by us: sub_second.txt + both deleted: main.txt + added by them: sub_master.txt + added by us: sub_second.txt no changes added to commit (use "git add" and/or "git commit -a") EOF @@ -203,7 +203,7 @@ Changes to be committed: Unmerged paths: (use "git rm <file>..." to mark resolution) - both deleted: main.txt + both deleted: main.txt Untracked files not listed (use -u option to show untracked files) EOF |