[PATCH] Fix bug in clang-format while merging short function (PR19461)

[Daniel Jasper]

A few indentations aside, this looks good.

================
Comment at: unittests/Format/FormatTest.cpp:7477
@@ -7446,1 +7476,3 @@
 
+verifyFormat("#ifdef _DEBUG\n"
+               "int foo(int i = 0)\n"
----------------
The indentation here is off. Maybe use clang-format ;-).

================
Comment at: unittests/Format/FormatTest.cpp:7487
@@ +7486,3 @@
+
+    verifyFormat("void foo() {}\n"
+               "void bar()\n"
----------------
Same here.

================
Comment at: unittests/Format/FormatTest.cpp:7628
@@ +7627,3 @@
+
+verifyFormat("#ifdef _DEBUG\n"
+               "int foo(int i = 0)\n"
----------------
Same here.

================
Comment at: unittests/Format/FormatTest.cpp:7638
@@ +7637,3 @@
+
+    verifyFormat("void foo() {}\n"
+               "void bar()\n"
----------------
Same here.

http://reviews.llvm.org/D3439