2 Commits (fcd424011bf7b841e9d4b3154ecadf6bf5e6e686)

Author SHA1 Message Date
Jonathan Nieder 20c7e3d5cf Show usage string for 'git merge-ours -h' 16 years ago
Thomas Harning a00a42ae33 git-merge-ours: make it a builtin. 18 years ago