2 Commits (8b2337a5893479ee18dfb21a1d4aa5fc1608872d)

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