summaryrefslogtreecommitdiffstats
path: root/man1/git-merge-file.1
diff options
context:
space:
mode:
Diffstat (limited to 'man1/git-merge-file.1')
-rw-r--r--man1/git-merge-file.16
1 files changed, 3 insertions, 3 deletions
diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1
index 76c8c1f32..fdebcdb30 100644
--- a/man1/git-merge-file.1
+++ b/man1/git-merge-file.1
@@ -2,12 +2,12 @@
.\" Title: git-merge-file
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2023-09-22
+.\" Date: 2023-09-29
.\" Manual: Git Manual
-.\" Source: Git 2.42.0.270.gbcb6cae296
+.\" Source: Git 2.42.0.296.g493f462273
.\" Language: English
.\"
-.TH "GIT\-MERGE\-FILE" "1" "2023\-09\-22" "Git 2\&.42\&.0\&.270\&.gbcb6ca" "Git Manual"
+.TH "GIT\-MERGE\-FILE" "1" "2023\-09\-29" "Git 2\&.42\&.0\&.296\&.g493f46" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------