mirror of
https://github.com/git/git.git
synced 2026-01-11 13:23:12 +09:00
Merge branch 'tb/bitamp-typofix'
Typofix. * tb/bitamp-typofix: pseudo-merge.h: fix a typo
This commit is contained in:
commit
97b747ca11
@ -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
|
* 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 pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm,
|
||||||
struct bitmap *parents);
|
struct bitmap *parents);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user