Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/rm-removed-paths'
author
Junio C Hamano
<gitster@pobox.com>
Sun, 7 Apr 2013 21:33:14 +0000
(14:33 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 7 Apr 2013 21:33:14 +0000
(14:33 -0700)
A handful of test cases and a corner case bugfix for "git rm".
* jk/rm-removed-paths:
t3600: document failure of rm across symbolic links
t3600: test behavior of reverse-d/f conflict
rm: do not complain about d/f conflicts during deletion
1
2
dir.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
e65cdde
03415ca
)
diff --cc
dir.c
Simple merge