diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
| commit | b2f6eab4027beaaa7415e70dad269bdc7cc27722 (patch) | |
| tree | 2e6088ca17b4042ccf9c658148cd5af55021c8a1 /merge-recursive.c | |
| parent | 06316234accdcb6608506aed6600cd60ff5c5c8e (diff) | |
| parent | fbcda3c0a72cbcc105100ebef1b1dae54d854204 (diff) | |
| download | git-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.gz | |
Merge branch 'maint'
* maint:
Prepare draft release notes to 1.7.4.2
gitweb: highlight: replace tabs with spaces
make_absolute_path: return the input path if it points to our buffer
valgrind: ignore SSE-based strlen invalid reads
diff --submodule: split into bite-sized pieces
cherry: split off function to print output lines
branch: split off function that writes tracking info and commit subject
standardize brace placement in struct definitions
compat: make gcc bswap an inline function
enums: omit trailing comma for portability
Conflicts:
RelNotes
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2a4f739365..3debbc44a0 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -83,10 +83,8 @@ struct rename_df_conflict_info { * Since we want to write the index eventually, we cannot reuse the index * for these (temporary) data. */ -struct stage_data -{ - struct - { +struct stage_data { + struct { unsigned mode; unsigned char sha[20]; } stages[4]; @@ -390,8 +388,7 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, } } -struct rename -{ +struct rename { struct diff_filepair *pair; struct stage_data *src_entry; struct stage_data *dst_entry; @@ -704,8 +701,7 @@ static void update_file(struct merge_options *o, /* Low level file merging, update and removal */ -struct merge_file_info -{ +struct merge_file_info { unsigned char sha[20]; unsigned mode; unsigned clean:1, |