2 Commits (c8610a2e7eca60a060f719f0aeb20f146e339de4)

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