Andrew's git / gitweb.git / blobdiff
?
git-rm: update to saner semantics
[gitweb.git] / Documentation / git-merge-file.txt
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 0b41d66a70dd7e36854bcc10706202bd4e1880a1..29d3faa556f8e7148edd9f01d1ffa870e78502b8 100644 (file)
--- 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