Which merge_file() function do you mean?
[git] / prompt.c
2011-12-13  Jeff Kingprompt: use git_terminal_prompt
2011-12-13  Jeff Kingrefactor git_getpass into generic prompt function
2011-12-13  Jeff Kingmove git_getpass to its own source file