1 Commits (ec136663c7d5a8e2ce1664ce79f2297e2e61c86f)

Author SHA1 Message Date
Linus Torvalds 81b50f3ce4 Move 'builtin-*' into a 'builtin/' subdirectory 15 years ago
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