summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:30 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 23:52:53 -0800
commit439fb8296d0a08c09653a45c0f44757c6b9c99b2 (patch)
tree374a8a4a24427e1b96141cc45632138725df91f2 /Documentation/merge-options.txt
parenti18n: git-add basic messages (diff)
downloadtgif-439fb8296d0a08c09653a45c0f44757c6b9c99b2.tar.xz
i18n: git-add "The following paths are ignored" message
The tests t2204 (.gitignore) and t3700 (add) explicitly check for these messages, so while at it, split each relevant test into a part that just checks "git add"'s exit status and a part that checks porcelain output. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions