summaryrefslogtreecommitdiff
path: root/t/t4046-diff-unmerged.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:03:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:03:25 -0700
commit1a61be2a525e1a9285d922907c5b3a7ef8ecf17b (patch)
tree8300f548bbdb42d48d12dc0116cd5a28dacf218b /t/t4046-diff-unmerged.sh
parentMerge branch 'ps/docs-diffcore' into maint (diff)
parentgit-status: make porcelain more robust (diff)
downloadtgif-1a61be2a525e1a9285d922907c5b3a7ef8ecf17b.tar.xz
Merge branch 'mg/status-porcelain-no-i18n' into maint
"git status --porcelain" is supposed to give a stable output, but a few strings were left as translatable by mistake. * mg/status-porcelain-no-i18n: git-status: make porcelain more robust
Diffstat (limited to 't/t4046-diff-unmerged.sh')
0 files changed, 0 insertions, 0 deletions