Fix mis-mark-up in git-merge-file.txt documentation
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 08:46:35 +0000 (00:46 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 17 Dec 2006 09:14:44 +0000 (01:14 -0800)
commit38477d9e6055e3572b465ec3f8e716164111683d
tree430af1096526421b6d69d6f834e15f8f7a9df5fe
parenta7f196a74650e45ce240754e2caa483752651063
Fix mis-mark-up in git-merge-file.txt documentation

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge-file.txt