diff options
| author | Russell Belfer <rb@github.com> | 2013-02-11 11:44:00 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-02-11 11:44:00 -0800 |
| commit | 390a3c81410a219b13aa6f333949c803524c8bd2 (patch) | |
| tree | b6487640acf5adb87f5a0f8ee25dedd44df63ffb /src/index.c | |
| parent | e026cfee003e103d79e56983d68a206ae907eada (diff) | |
| parent | 3ad052218cd03fe58b254f878825e3f0fd4b3054 (diff) | |
| download | libgit2-390a3c81410a219b13aa6f333949c803524c8bd2.tar.gz | |
Merge pull request #1190 from nulltoken/topic/reset-paths
reset: Allow the selective reset of pathspecs
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/index.c b/src/index.c index f5bf954a8..25156d08f 100644 --- a/src/index.c +++ b/src/index.c @@ -929,7 +929,7 @@ int git_index_conflict_add(git_index *index, goto on_error; } - return 0; + return 0; on_error: for (i = 0; i < 3; i++) { |