kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix mis-mark-up in git-merge-file.txt documentation 

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-12-17 00:46:35 -08:00
parent a7f196a746
commit 38477d9e60
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-merge-file.txt
View File

@ -1,9 +1,9 @@
git-merge-file(1) git-merge-file(1)
============ =================


NAME NAME
---- ----
git-merge-file - threeway file merge git-merge-file - three-way file merge




SYNOPSIS SYNOPSIS