diff options
| author | Ben Straub <bstraub@github.com> | 2012-06-05 12:52:44 -0700 |
|---|---|---|
| committer | Ben Straub <bstraub@github.com> | 2012-06-05 12:52:44 -0700 |
| commit | 56a5000d580ef5c9605bc9076610b5af9aa67518 (patch) | |
| tree | 4026c8333991fbe221a17b5d16e5e4b52f66cb20 /include/git2/diff.h | |
| parent | e267c9fc1a4910d1081e97b4d7a411658ddc0def (diff) | |
| parent | 01dbe273c9b6f86a613b67cee27212cf4bacf4c0 (diff) | |
| download | libgit2-56a5000d580ef5c9605bc9076610b5af9aa67518.tar.gz | |
Merge branch 'development' into rev-parse
Conflicts:
src/util.h
tests-clar/refs/branches/listall.c
Diffstat (limited to 'include/git2/diff.h')
| -rw-r--r-- | include/git2/diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index bafe6268c..a0e8ad6d2 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -155,7 +155,7 @@ typedef int (*git_diff_hunk_fn)( * * These values describe where a line came from and will be passed to * the git_diff_data_fn when iterating over a diff. There are some - * special origin contants at the end that are used for the text + * special origin constants at the end that are used for the text * output callbacks to demarcate lines that are actually part of * the file or hunk headers. */ |