summaryrefslogtreecommitdiff
path: root/merge-index.c
AgeCommit message (Expand)AuthorFilesLines
2006-06-19Restore SIGCHLD to SIG_DFL where we care about waitpid().Libravatar Junio C Hamano1-0/+5
2005-11-28Make the rest of commands work from a subdirectory.Libravatar Junio C Hamano1-0/+1
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+135