mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ak/typofix-2.46-maint'

Browse Source 
Typofixes.

* ak/typofix-2.46-maint:
  perl: fix a typo
  mergetool: fix a typo
  reftable: fix a typo
  trace2: fix typos
This commit is contained in:
Junio C Hamano
2024-10-04 14:21:40 -07:00
parent 8895aca996 686f3337a6
commit 4861bbf85a
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mergetools/vimdiff
View File

@ -411,7 +411,7 @@ merge_cmd () {
-f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"' -f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"'
else else
# If there is no BASE (example: a merge conflict in a new file # If there is no BASE (example: a merge conflict in a new file
# with the same name created in both braches which didn't exist # with the same name created in both branches which didn't exist
# before), close all BASE windows using vim's "quit" command # before), close all BASE windows using vim's "quit" command
FINAL_CMD=$(echo "$FINAL_CMD" | \ FINAL_CMD=$(echo "$FINAL_CMD" | \

2
perl/Git/I18N.pm
View File

@ -111,7 +111,7 @@ L<Locale::Messages>'s ngettext function or passthrough fallback function.
=head2 N__($) =head2 N__($)
No-operation that only returns its argument. Use this if you want xgettext to No-operation that only returns its argument. Use this if you want xgettext to
extract the text to the pot template but do not want to trigger retrival of the extract the text to the pot template but do not want to trigger retrieval of the
translation at run time. translation at run time.
=head1 AUTHOR =head1 AUTHOR

2
reftable/reader.h
View File

@ -30,7 +30,7 @@ struct reftable_reader_offsets {
/* The state for reading a reftable file. */ /* The state for reading a reftable file. */
struct reftable_reader { struct reftable_reader {
/* for convience, associate a name with the instance. */ /* for convenience, associate a name with the instance. */
char *name; char *name;
struct reftable_block_source source; struct reftable_block_source source;

2
trace2/tr2_ctr.c
View File

@ -4,7 +4,7 @@
#include "trace2/tr2_ctr.h" #include "trace2/tr2_ctr.h"
/* /*
* A global counter block to aggregrate values from the partial sums * A global counter block to aggregate values from the partial sums
* from each thread. * from each thread.
*/ */
static struct tr2_counter_block final_counter_block; /* access under tr2tls_mutex */ static struct tr2_counter_block final_counter_block; /* access under tr2tls_mutex */

2
trace2/tr2_tls.h
View File

@ -11,7 +11,7 @@
*/ */
/* /*
* Arbitry limit for thread names for column alignment. * Arbitrary limit for thread names for column alignment.
*/ */
#define TR2_MAX_THREAD_NAME (24) #define TR2_MAX_THREAD_NAME (24)