diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-03-18 01:54:04 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-11 14:12:27 -0400 |
| commit | f78bb2afb3a7f23264c4adf2e9debfa415ca8107 (patch) | |
| tree | a2143316678e3c3c8eb2e75426c46078d93ece67 /tests/diff/binary.c | |
| parent | 958950b6e077f09821c164d0897e66eca553375c (diff) | |
| download | libgit2-f78bb2afb3a7f23264c4adf2e9debfa415ca8107.tar.gz | |
stash: return GIT_EMERGECONFLICT on merge conflict
Diffstat (limited to 'tests/diff/binary.c')
0 files changed, 0 insertions, 0 deletions