mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
Fix mis-mark-up in git-merge-file.txt documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a7f196a746
commit
38477d9e60
@ -1,9 +1,9 @@
|
||||
git-merge-file(1)
|
||||
============
|
||||
=================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-merge-file - threeway file merge
|
||||
git-merge-file - three-way file merge
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
|
Loading…
Reference in New Issue
Block a user