2 Commits (7bfe6e261378a30980886994dabc0e7e4c9ce3d8)

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