| commit | 38477d9e6055e3572b465ec3f8e716164111683d | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junkio@cox.net> | Sun Dec 17 00:46:35 2006 -0800 |
| committer | Junio C Hamano <junkio@cox.net> | Sun Dec 17 01:14:44 2006 -0800 |
| tree | 430af1096526421b6d69d6f834e15f8f7a9df5fe | |
| parent | a7f196a74650e45ce240754e2caa483752651063 [diff] |
Fix mis-mark-up in git-merge-file.txt documentation Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 0b41d66..29d3faa 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