summaryrefslogtreecommitdiff
path: root/merge-index.c
Commit message (Expand)AuthorAgeFilesLines
* Restore SIGCHLD to SIG_DFL where we care about waitpid().Junio C Hamano2006-06-191-0/+5
* Make the rest of commands work from a subdirectory.Junio C Hamano2005-11-281-0/+1
* Big tool rename.Junio C Hamano2005-09-071-0/+135