merge: indentation fixup

ethomson · ethomson · commit b53d834fcaf2 · 2017-03-23T09:46:22.000Z
diff --git a/src/merge.c b/src/merge.c
@@ -2032,7 +2032,7 @@ int git_merge_trees(
 
 		if (result) {
 			if ((error = git_index_new(out)) == 0)
-			error = git_index_read_tree(*out, result);
+    			error = git_index_read_tree(*out, result);
 
 			return error;
 		}

Original file line number	Diff line number	Diff line change
`@@ -2032,7 +2032,7 @@ int git_merge_trees(`
`2032`	`2032`
`2033`	`2033`	`if (result) {`
`2034`	`2034`	`if ((error = git_index_new(out)) == 0)`
`2035`		`- error = git_index_read_tree(*out, result);`
	`2035`	`+ error = git_index_read_tree(*out, result);`
`2036`	`2036`
`2037`	`2037`	`return error;`
`2038`	`2038`	`}`