launch_editor(): read the file, even when EDITOR=:
[gitweb.git] / builtin-merge-ours.c
2007-11-23 Merge branch 'maint'
2007-11-22 git-merge-ours: make it a builtin.