Merge branch 'rt/doc-merge-file-diff3'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:08:23 +0000 (10:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Aug 2013 17:08:23 +0000 (10:08 -0700)
commit482bd22...4985d605e7778c0e9ee21c65891f2b55
tree4936e14...567b33abf97b8021f3877701ea33aae9copy hash to clipboard (tree)
parent04d0eb8...e3e3a5ff5a3b656a35f7c4b9a5608b16copy hash to clipboard (diff)
parent67ed84f...e25db8e81dd905dbe275bbcd37afb543copy hash to clipboard (diff)