author | Junio C Hamano <gitster@pobox.com> | |
Wed, 17 Nov 2010 23:06:29 +0000 (15:06 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 17 Nov 2010 23:06:29 +0000 (15:06 -0800) |
* cb/leading-path-removal:
use persistent memory for rejected paths
use persistent memory for rejected paths
1 | 2 | |||
---|---|---|---|---|
t/t7607-merge-overwrite.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc t/t7607-merge-overwrite.sh
Simple merge