diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-29 20:14:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-29 20:14:50 (GMT) |
| commit | 9e62316df7f918eabc879f97da76543cc5f0b3fc (patch) | |
| tree | 02c011e93166426fb92f07ccd355b20c04625b51 /builtin/merge.c | |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff) | |
| download | git-9e62316df7f918eabc879f97da76543cc5f0b3fc.zip git-9e62316df7f918eabc879f97da76543cc5f0b3fc.tar.gz git-9e62316df7f918eabc879f97da76543cc5f0b3fc.tar.bz2 | |
merge: test the top-level merge driver
We seem to have tests for specific merge strategy backends
(e.g. recursive), but not much test coverage for the "git merge"
itself. As I am planning to update the semantics of merging
"FETCH_HEAD" in such a way that these two
git pull . topic_a topic_b...
vs.
git fetch . topic_a topic_b...
git merge FETCH_HEAD
are truly equivalent, let me add a few test cases to cover the
tricky ones.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions