diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:51:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:51:10 -0700 |
| commit | d011ab4312a8ddabd143567fa9706b8e9fb9c0a4 (patch) | |
| tree | a7167cc0ece6125ff59ba1fc6ae78119f863017d /builtin | |
| parent | 3bbbf18d711eb8fe3390580963c1a071e03cbb38 (diff) | |
| parent | 187c00c6c58ba8916a37011b56cb0cb8f2dd1805 (diff) | |
| download | git-d011ab4312a8ddabd143567fa9706b8e9fb9c0a4.tar.gz | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
merge-tree: fix typo in merge-tree.c::unresolved
git-commit doc: describe use of multiple `-m` options
git-pull doc: fix grammo ("conflicts" is plural)
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index e0d0b7d28b..bc912e399e 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -245,7 +245,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3]) unsigned dirmask = 0, mask = 0; for (i = 0; i < 3; i++) { - mask |= (1 << 1); + mask |= (1 << i); if (n[i].mode && S_ISDIR(n[i].mode)) dirmask |= (1 << i); } |