Johannes Schindelin caba139d43 Use git-merge-file in git-merge-one-file, too ...

Would you believe? I edited git-merge-one-file (note the missing ".sh"!)
when I submitted the patch which became commit e2b7008752...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

2006-12-21 20:33:06 -08:00

3.1 KiB

Executable File

Raw Blame History

View Raw