Merge branch 'sc/difftool-skip'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
commit1ad4b17...069a7b692ab801bda37c5ab35ef0208e
treeef5b188...b491f189681538b5f473c34e7cbff3cfcopy hash to clipboard (tree)
parentb76c561...74cd366786b7b762795fba1551b42149copy hash to clipboard (diff)
parent15a31e7...852f4ede5335552875006daeedfc3aa7copy hash to clipboard (diff)