summaryrefslogtreecommitdiff
path: root/src/xdiff/xmerge.c
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-12-10 14:53:12 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2014-12-10 14:53:12 +0100
commit3b6a566867b3a62aeeed8320f17f1d125e1fe0d2 (patch)
tree9a520bc0b49d5283a6636815a88869796c2d593d /src/xdiff/xmerge.c
parent0fae0391163c9c747e4b80976cf06dbf2917e479 (diff)
parenta7e06cb026ac3edb0e5c4bac980584e98235d2a8 (diff)
downloadlibgit2-3b6a566867b3a62aeeed8320f17f1d125e1fe0d2.tar.gz
Merge pull request #2755 from libgit2/ntk/readme_appveyor_build
Minor Readme improvments
Diffstat (limited to 'src/xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions