]> git.ipfire.org Git - thirdparty/git.git/commit - rerere.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a14c7ab) | patch
rerere: drop want_sp parameter from is_cmarker()
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jun 2015 22:05:24 +0000 (15:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 22:09:07 +0000 (15:09 -0700)
commit67711cdc399203ec1d70cde2c3cd71e37e43da70
treeca6678b301627387cb345bf78d63d4645bc8ce83tree | snapshot
parenta14c7ab8f58f3b2aea99e65a74c9f9ab4f955a40commit | diff
rerere: drop want_sp parameter from is_cmarker()

As the nature of the conflict marker line determines if there should
be a SP and label after it, the caller shouldn't have to pass the
parameter redundantly.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
rerere.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.