summaryrefslogtreecommitdiff
path: root/tests/diff/blob.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-05-27 20:58:20 -0500
committerEdward Thomson <ethomson@microsoft.com>2014-05-27 20:58:20 -0500
commiteff531e1034401b144b02ff2913a361669d04129 (patch)
tree0e2eed2ab33d565c09a848d3af552959877a4bef /tests/diff/blob.c
parentde3f851ec49deba7b152c01c53aa329439d1f3f5 (diff)
downloadlibgit2-eff531e1034401b144b02ff2913a361669d04129.tar.gz
Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE
Diffstat (limited to 'tests/diff/blob.c')
0 files changed, 0 insertions, 0 deletions