summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-10-27 14:23:35 -0500
committerEdward Thomson <ethomson@microsoft.com>2015-11-25 15:37:39 -0500
commitfccad82ee8f431e06097b3a1282228b40ae7128f (patch)
treeb9a76183b429afa1f12b4a1c06cda047800a764c /src/merge.c
parent99d9d9a470ca9b693f6dbee05f1cfcd98a5d148d (diff)
downloadlibgit2-fccad82ee8f431e06097b3a1282228b40ae7128f.tar.gz
merge: add recursive test with three merge bases
Diffstat (limited to 'src/merge.c')
0 files changed, 0 insertions, 0 deletions