Merge branch 'nd/style-opening-brace'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:52 +0000 (13:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:52 +0000 (13:49 -0800)
Code clean-up.

* nd/style-opening-brace:
  style: the opening '{' of a function is in a separate line

1  2 
bisect.c
builtin/push.c
convert.c
diff.c
git.c
sequencer.c
userdiff.c

diff --cc bisect.c
Simple merge
diff --cc builtin/push.c
Simple merge
diff --cc convert.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc git.c
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc userdiff.c
Simple merge