]>
author | Edward Thomson <ethomson@microsoft.com> | |
Tue, 19 May 2015 15:23:59 +0000 (11:23 -0400) | ||
committer | Edward Thomson <ethomson@microsoft.com> | |
Thu, 28 May 2015 13:47:31 +0000 (09:47 -0400) | ||
commit | 9f545b9d71c7bd316be80e5fe8b47135e9deb97e | |
tree | d2cf3279b4fd716fcea963a2a0118dd522a52270 | tree |
parent | 2f1080ea04ad1235efcd4b213dbe3a1b847644f7 | commit | diff |
CHANGELOG.md | diff | blob | blame | history | |
include/git2/index.h | diff | blob | blame | history | |
src/diff.c | diff | blob | blame | history | |
src/index.c | diff | blob | blame | history | |
src/iterator.c | diff | blob | blame | history | |
src/merge.c | diff | blob | blame | history | |
tests/index/conflicts.c | diff | blob | blame | history | |
tests/merge/trees/trivial.c | diff | blob | blame | history | |
tests/merge/workdir/trivial.c | diff | blob | blame | history |