diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-29 16:42:40 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-29 16:42:40 +0200 |
| commit | 64be170d4786f5cc782d8d124cee0c1e2969d60a (patch) | |
| tree | b66b6fce8cacf621e23207dc67a597314f0dbe16 /tests/diff/tree.c | |
| parent | 41a71c1a5eb891e7af1c7a3226c3c26e1a70b97c (diff) | |
| parent | 885b94aac06f17c55bd6f8df318e0cffb0104efa (diff) | |
| download | libgit2-64be170d4786f5cc782d8d124cee0c1e2969d60a.tar.gz | |
Merge pull request #3163 from ethomson/emergeconflict
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
Diffstat (limited to 'tests/diff/tree.c')
0 files changed, 0 insertions, 0 deletions