Code

Do not generate full commit log message if it is not going to be used
[git.git] / builtin-merge-ours.c
2007-11-23 Junio C HamanoMerge branch 'maint'
2007-11-22 Thomas Harninggit-merge-ours: make it a builtin.