| commit | ec7d70969ee62009146d3636340c5e7023f24ff9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 23:06:29 +0000 (17 15:06 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 23:06:29 +0000 (17 15:06 -0800) | ||
| tree | 4169c93f7081d2807c21ab2efb3662fc620aeb2e | treesnapshot (tar.gz zip) |
| parent | 86e5b51fac729d2aa9ce1a9e8f945653d215cf74 | commitdiff |
| parent | 7980872d4ef3ce24329cbdb6d61dc2ed48cbf1c5 | commitdiff |
Merge branch 'cb/leading-path-removal' into next
* cb/leading-path-removal:
use persistent memory for rejected paths
* cb/leading-path-removal:
use persistent memory for rejected paths
| t/t7607-merge-overwrite.sh | diff1 | diff2 | blobhistory |