diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-05-13 21:57:37 +0200 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-05-15 22:41:30 +0200 |
| commit | 1fed6b07f0722c8b4349ff3709a49df3d3c9ae61 (patch) | |
| tree | 2c1b791be59a061bebab3392575a0b90dc323b23 /include/git2/merge.h | |
| parent | f0ab73720a4e7a9b37c901a27519ea65eafeb8a6 (diff) | |
| download | libgit2-1fed6b07f0722c8b4349ff3709a49df3d3c9ae61.tar.gz | |
Fix trailing whitespaces
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 738d8e028..955840569 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -33,7 +33,7 @@ typedef enum { /** * Automerge options for `git_merge_trees_opts`. - */ + */ typedef enum { GIT_MERGE_AUTOMERGE_NORMAL = 0, GIT_MERGE_AUTOMERGE_NONE = 1, @@ -45,10 +45,10 @@ typedef enum { typedef struct { unsigned int version; git_merge_tree_flags flags; - + /** Similarity to consider a file renamed (default 50) */ unsigned int rename_threshold; - + /** Maximum similarity sources to examine (overrides the * `merge.renameLimit` config) (default 200) */ @@ -56,7 +56,7 @@ typedef struct { /** Pluggable similarity metric; pass NULL to use internal metric */ git_diff_similarity_metric *metric; - + /** Flags for automerging content. */ git_merge_automerge_flags automerge_flags; } git_merge_tree_opts; |