Fix thinko in the logic to refuse unmerged path fed to git-apply-patch-script.
[gitweb.git] / git-resolve-script
2005-05-06 Merge of http://members.cox.net/junkio/git-jc.git
2005-05-05 Fix git-resolve-script.
2005-05-05 Split "git-pull-script" into two parts