Hash :
ecd60a56
Author :
Date :
2015-05-14T11:52:48
conflicts: when adding conflicts, remove staged When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result.
| Git HTTP | https://git.kmx.io/thodg/libgit2.git |
|---|---|
| Git SSH | git@git.kmx.io:thodg/libgit2.git |
| Public access ? | public |
| Description | |
|
Users |
|
| Tags |
|