diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:58:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:58:07 -0700 |
| commit | 8617715cc09b7422fe31189f9476f6ade73ede70 (patch) | |
| tree | 7c62d215a31c9e990753b2bc1e8aee1870f06c4c /builtin | |
| parent | ccf23370aacf01111eebdee196da10d4e61a6be4 (diff) | |
| parent | 9a82efd0d2a2727507bd908d7f0545437fcc0ff6 (diff) | |
| download | git-8617715cc09b7422fe31189f9476f6ade73ede70.tar.gz git-8617715cc09b7422fe31189f9476f6ade73ede70.tar.xz | |
Merge branch 'maint'
* maint:
More fixes for 1.8.2.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 e0d0b7d28..bc912e399 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); } |