diff options
author | Jeff King <peff@peff.net> | 2011-04-29 18:23:54 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-29 15:37:08 -0700 |
commit | cf1af1b1f3ddd2554f64aae120635952801a9632 (patch) | |
tree | 87d8f1696565764f3822afdc6889fcee22d0d2b7 /t/t4028-format-patch-mime-headers.sh | |
parent | fast-import: introduce "feature notes" command (diff) | |
download | tgif-cf1af1b1f3ddd2554f64aae120635952801a9632.tar.xz |
add tests for merge-index / merge-one-file
There were no tests for either, except a brief use in
t1200-tutorial.
These tools are not used much these days, as most people
use the merge-recursive strategy, which handles everything
internally. However, they are used by the "octopus" and
"resolve" strategies, as well as any custom strategies
or merge scripts people have built around them.
For example, together with read-tree, they are the simplest
way to do a basic content-level merge without checking out
the entire repository contents beforehand.
This script adds a basic test of the tools to perform one
content-level merge. It also shows a failure of the tools to
work properly in the face of GIT_WORK_TREE or core.worktree.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4028-format-patch-mime-headers.sh')
0 files changed, 0 insertions, 0 deletions