diff options
| author | Carlos MartÃn Nieto <carlosmn@github.com> | 2017-01-13 17:05:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 17:05:58 +0100 |
| commit | a6d833a29e100cae66d5144367e9102d093d4dbd (patch) | |
| tree | e57dce696483b3c166535e75aefe0feedad6b0d8 /src/diff_tform.c | |
| parent | ffe259d9e52a472b172d9834ed44a98fd1ce4d1a (diff) | |
| parent | 8f0d5cdef9e2cb53c2f455d0a449f25c87647811 (diff) | |
| download | libgit2-a6d833a29e100cae66d5144367e9102d093d4dbd.tar.gz | |
Merge pull request #4049 from libgit2/ethomson/error_msgs
giterr_set: consistent error messages
Diffstat (limited to 'src/diff_tform.c')
| -rw-r--r-- | src/diff_tform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index e8848bd45..f2ff147d1 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -131,7 +131,7 @@ int git_diff__merge( if (ignore_case != ((from->opts.flags & GIT_DIFF_IGNORE_CASE) != 0) || reversed != ((from->opts.flags & GIT_DIFF_REVERSE) != 0)) { giterr_set(GITERR_INVALID, - "Attempt to merge diffs created with conflicting options"); + "attempt to merge diffs created with conflicting options"); return -1; } |