summaryrefslogtreecommitdiff
path: root/lib/git-merge-changelog.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/git-merge-changelog.c')
-rw-r--r--lib/git-merge-changelog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 660e0e0096..43810d2301 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -12,7 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* README:
The default merge driver of 'git' *always* produces conflicts when
@@ -1041,7 +1041,7 @@ main (int argc, char *argv[])
/* Version information is requested. */
printf ("%s\n", getprogname ());
printf ("Copyright (C) %s Free Software Foundation, Inc.\n\
-License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n\
+License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl.html>\n\
This is free software: you are free to change and redistribute it.\n\
There is NO WARRANTY, to the extent permitted by law.\n\
",