git-add: remove conflicting entry when adding.
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:09:41 +0000 (01:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:14:43 +0000 (01:14 -0800)
commitc33ab0d...100d91d417b5ed3378acbf3310c07cec
tree297253b...e7b6226f1eff5a8010f0fc7fc3f4094acopy hash to clipboard (tree)
parent790fa0e...97b41b9e8c98a77b58004c58408e5f7acopy hash to clipboard (diff)
read-cache.c