summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-19 20:32:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-19 23:08:58 -0700
commit340ce9e25f40ef2fead9fcc027844c66737c85dd (patch)
treead95133538b813d14d1781011e33266945c1aa7e /builtin-merge-ours.c
parentgit-add --all: add all files (diff)
downloadtgif-340ce9e25f40ef2fead9fcc027844c66737c85dd.tar.xz
git-add --all: tests
And here is a small test script that makes sure that: - both modified and new files are included, - removed file is noticed, and - no ignored file is included. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions