diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-29 15:05:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 15:09:07 -0700 |
| commit | 67711cdc399203ec1d70cde2c3cd71e37e43da70 (patch) | |
| tree | ca6678b301627387cb345bf78d63d4645bc8ce83 /git-mergetool.sh | |
| parent | a14c7ab8f58f3b2aea99e65a74c9f9ab4f955a40 (diff) | |
| download | git-67711cdc399203ec1d70cde2c3cd71e37e43da70.tar.gz | |
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>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions