| commit | 75e8ac1bc0d18c1f8ca82f22ec04c8407298f41f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Jul 2010 23:06:28 +0000 (28 16:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 28 Jul 2010 23:06:28 +0000 (28 16:06 -0700) | ||
| tree | cf6f24221823f7e5e7e394e5808ef4a7331fadc5 | treesnapshot (tar.gz zip) |
| parent | cb0551403e2c973b5caf8c3b1db1caf5ad1599de | commitdiff |
| parent | 2fd1ea14056cb630bbf99588b78d7d68f51907ce | commitdiff |
Merge branch 'en/d-f-conflict-fix' into next
* en/d-f-conflict-fix:
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
* en/d-f-conflict-fix:
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
| t/t6035-merge-dir-to-symlink.sh | diff1 | diff2 | blobhistory |