]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95ae2c7) | patch
cmd_merge(): remove unneeded flag variable
authorMichael Haggerty <mhagger@alum.mit.edu>
Thu, 7 Apr 2016 19:03:06 +0000 (15:03 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Apr 2016 18:35:34 +0000 (11:35 -0700)
commit17377b62520fc12bd179514c8510d68e25dfb686
treecc905fdc6b0ee2f059750c0b99d6878d119e5afftree | snapshot
parent95ae2c7490fe241e6fbdc3e26789b3cee8ec9914commit | diff
cmd_merge(): remove unneeded flag variable

It is never read, so we can pass NULL to resolve_ref_unsafe().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.