summaryrefslogtreecommitdiff
path: root/tests/diff/binary.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2015-05-01 13:53:46 -0400
committerEdward Thomson <ethomson@microsoft.com>2015-05-11 14:12:23 -0400
commit958950b6e077f09821c164d0897e66eca553375c (patch)
tree69bb392a39cf6ee15637bbc1e85403a84a5a84ca /tests/diff/binary.c
parentf0957589ee57cf5a98e4aa3ce742fb68c3e36f19 (diff)
downloadlibgit2-958950b6e077f09821c164d0897e66eca553375c.tar.gz
stash: document merge conflicts
Diffstat (limited to 'tests/diff/binary.c')
0 files changed, 0 insertions, 0 deletions