Merge branch 'po/fix-doc-merge-base-illustration' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)
commit311811b...9ff3e0f7035e09ec45f992f10beaaa56
tree3b1c7d8...9dd2de73d2effbfaf8ff861bda2bfb06copy hash to clipboard (tree)
parentb943a21...fe6740f64e2ce3fafebce453814115d9copy hash to clipboard (diff)
parent6750f62...9917969dbb191406c3ed31d5a75a9eddcopy hash to clipboard (diff)