Andrew's git / gitweb.git / diff
?
Merge branch 'jc/merge'
authorJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 08:22:48 +0000 (00:22 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 08:22:48 +0000 (00:22 -0800)
* jc/merge:
git-merge knows some strategies want to skip trivial merges

Trivial merge