summaryrefslogtreecommitdiff
path: root/src/merge_file.c
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-08-13 21:23:23 +0200
committerVicent Marti <vicent@github.com>2014-08-13 21:23:23 +0200
commit0707feee37df7e8cdb007bcd57fb48c5b2e8a814 (patch)
tree02b6743ee51307812405d9e138c5087cfb5cc247 /src/merge_file.c
parent59403f1ff55346c64bfaa0744ea7f3375da71725 (diff)
parente62f96dea5a46098cbca5a287f29ca811003bd68 (diff)
downloadlibgit2-0707feee37df7e8cdb007bcd57fb48c5b2e8a814.tar.gz
Merge pull request #2513 from ethomson/giterr_null_msg
Allow NULL error message prefix when class=GITERR_OS
Diffstat (limited to 'src/merge_file.c')
0 files changed, 0 insertions, 0 deletions