2 Commits (68ad5e1e9c10e8a640703aadbdf8b8366014373b)

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