tree cac927fbeaa8cdb39f9ef3cdacdf13b20ee5e529
parent 0a423622813d28b9e7eb5b3e9daf7a1e58904dfc
author Russ Cox <rsc@golang.org> 1420733487 -0500
committer Russ Cox <rsc@golang.org> 1421208866 +0000

git-codereview: do not gofmt committed files during merge

Change-Id: Ie772b8f46587ad0d56350b697e75601f45b4c393
Reviewed-on: https://go-review.googlesource.com/2785
Reviewed-by: Andrew Gerrand <adg@golang.org>