Merge of http://members.cox.net/junkio/git-jc.git
[git] / git-resolve-script
2005-05-06  Linus TorvaldsMerge of http://members.cox.net/junkio/git-jc.git
2005-05-05  Linus TorvaldsFix git-resolve-script.
2005-05-05  Linus TorvaldsSplit "git-pull-script" into two parts