File tree Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -22,19 +22,19 @@ struct rerere_id {
22
22
int variant ;
23
23
};
24
24
25
- extern int setup_rerere (struct string_list * , int );
26
- extern int rerere (int );
25
+ int setup_rerere (struct string_list * , int );
26
+ int rerere (int );
27
27
/*
28
28
* Given the conflict ID and the name of a "file" used for replaying
29
29
* the recorded resolution (e.g. "preimage", "postimage"), return the
30
30
* path to that filesystem entity. With "file" specified with NULL,
31
31
* return the path to the directory that houses these files.
32
32
*/
33
- extern const char * rerere_path (const struct rerere_id * , const char * file );
34
- extern int rerere_forget (struct pathspec * );
35
- extern int rerere_remaining (struct string_list * );
36
- extern void rerere_clear (struct string_list * );
37
- extern void rerere_gc (struct string_list * );
33
+ const char * rerere_path (const struct rerere_id * , const char * file );
34
+ int rerere_forget (struct pathspec * );
35
+ int rerere_remaining (struct string_list * );
36
+ void rerere_clear (struct string_list * );
37
+ void rerere_gc (struct string_list * );
38
38
39
39
#define OPT_RERERE_AUTOUPDATE (v ) OPT_UYN(0, "rerere-autoupdate", (v), \
40
40
N_("update the index with reused conflict resolution if possible"))
You can’t perform that action at this time.
0 commit comments