Add test case for git-config-set
[git.git] / git-merge-ours.sh
2005-11-19 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-03 Junio C Hamanogit-merge-ours: make sure our index matches HEAD
2005-11-03 Junio C HamanoAdd 'ours' merge strategy.