2 Commits (3368d11f308eb4ba2ad5703aa059bb0e5a82212f)

Author SHA1 Message Date
Junio C Hamano 38477d9e60 Fix mis-mark-up in git-merge-file.txt documentation 18 years ago
Johannes Schindelin 9abaa7f033 Document git-merge-file 18 years ago