Merge branch 'js/replace-edit-use-editor-configuration' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)
commit8854ded...af794c10cc68957dbdd4c636811b97fa
tree9ed1364...8fe7bba1684df262fd568238dfcbed22copy hash to clipboard (tree)
parentb450a39...eaedeb89f1e1830e2d6193c9d37b5f1bcopy hash to clipboard (diff)
parent36b1437...dbafbe6682ea6b21c8de012253bff451copy hash to clipboard (diff)
builtin/replace.c