Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-17 02:08:25 +0300
committerJunio C Hamano <junkio@cox.net>2007-02-17 02:08:25 +0300
commitde6f0def506935811384a39fb0660095f5555e68 (patch)
treeb4772235b86b378bcf6f8528816a561fc971291b /builtin-update-index.c
parentefa13f7b7ea1605deab3a6478fa0d0706c828170 (diff)
git-merge: minor fix for no_trivial_merge_strategies.
The shell loop to determine if we should skip the trivial in-index merge stage based on what strategy is given was not prepared to have more than one strategy listed in the variable $no_trivial_merge_strategies. This does not trigger unless you use a modified git but the fix is simple and straightforward, so let's fix it before 1.5.0.1. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-update-index.c')
0 files changed, 0 insertions, 0 deletions