diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-07 14:23:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-07 14:23:20 -0700 |
| commit | 97b747ca11867a0ae3c508dfe3e5bd92e30a9723 (patch) | |
| tree | b369f5749a5fba48cf7783947d1403d1387a3f7b | |
| parent | 3bc7f869f06455157e87531526c17eee106bf904 (diff) | |
| parent | c000918eb756cccc76780dc4d37645eaa5d12f02 (diff) | |
| download | git-97b747ca11867a0ae3c508dfe3e5bd92e30a9723.tar.gz | |
Merge branch 'tb/bitamp-typofix'
Typofix.
* tb/bitamp-typofix:
pseudo-merge.h: fix a typo
| -rw-r--r-- | pseudo-merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pseudo-merge.h b/pseudo-merge.h index c9fbe9d312..cf0e62ecd1 100644 --- a/pseudo-merge.h +++ b/pseudo-merge.h @@ -210,7 +210,7 @@ int cascade_pseudo_merges(const struct pseudo_merge_map *pm, /* * Returns a pseudo-merge which contains the exact set of commits - * listed in the "parents" bitamp, or NULL if none could be found. + * listed in the "parents" bitmap, or NULL if none could be found. */ struct pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm, struct bitmap *parents); |