2 Commits (6be935115b4a3bfa9062875a569d4a018ac372e2)

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