Merge branch 'jh/notes-merge-in-git-dir-worktree'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:44 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:45 +0000 (22:51 -0700)
commit4e52008...b5ca75acd6b29f6385a94130ec7afe6d
tree23e89c6...f11f6227f40cc3edc19dc9c6d7267259copy hash to clipboard (tree)
parent3bec29b...07b616ca7227e6e20d415b69967809a9copy hash to clipboard (diff)
parentdabba59...aa0e94a8deb6f0e827144697895bcfe8copy hash to clipboard (diff)