Name |
Last commit
|
Last update |
---|---|---|
.. | ||
addall.c | ||
cache.c | ||
collision.c | ||
conflicts.c | ||
crlf.c | ||
filemodes.c | ||
inmemory.c | ||
names.c | ||
read_index.c | ||
read_tree.c | ||
rename.c | ||
reuc.c | ||
stage.c | ||
tests.c |
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.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
addall.c | Loading commit data... | |
cache.c | Loading commit data... | |
collision.c | Loading commit data... | |
conflicts.c | Loading commit data... | |
crlf.c | Loading commit data... | |
filemodes.c | Loading commit data... | |
inmemory.c | Loading commit data... | |
names.c | Loading commit data... | |
read_index.c | Loading commit data... | |
read_tree.c | Loading commit data... | |
rename.c | Loading commit data... | |
reuc.c | Loading commit data... | |
stage.c | Loading commit data... | |
tests.c | Loading commit data... |