Edward Thomson ecd60a56eb 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.		2015-05-28 09:43:49 -04:00
..
git2	conflicts: when adding conflicts, remove staged	2015-05-28 09:43:49 -04:00
git2.h	Remove the callbacks struct from the remote	2015-05-13 09:46:35 +02:00