summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2015-05-18 17:01:37 -0400
committerEdward Thomson <ethomson@microsoft.com>2015-05-28 09:44:14 -0400
commitb22369efa243022ff42582b559ddb6c6e05af2b1 (patch)
tree752901b45885cc77fcb9d6ebedc7b452a1ef8e14 /src
parentbb815157da1b3545d475a678e4db5292f6a723b2 (diff)
downloadlibgit2-b22369efa243022ff42582b559ddb6c6e05af2b1.tar.gz
diff conflicts: test index to workdir w/ conflicts
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions