summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-17 00:46:35 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-17 01:14:44 -0800
commit38477d9e6055e3572b465ec3f8e716164111683d (patch)
tree430af1096526421b6d69d6f834e15f8f7a9df5fe /Documentation/git-merge-file.txt
parenta7f196a74650e45ce240754e2caa483752651063 (diff)
downloadgit-38477d9e6055e3572b465ec3f8e716164111683d.tar.gz
Fix mis-mark-up in git-merge-file.txt documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-file.txt')
-rw-r--r--Documentation/git-merge-file.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 0b41d66a70..29d3faa556 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -1,9 +1,9 @@
git-merge-file(1)
-============
+=================
NAME
----
-git-merge-file - threeway file merge
+git-merge-file - three-way file merge
SYNOPSIS