Merge branch 'jc/merge'
* jc/merge: git-merge knows some strategies want to skip trivial merges
Junio C Hamano committed
Mar 26, 2006 at 00:22 UTC
692c7fc9cb81a2f68b23199d5b8612494fe4d317
No changes.
* jc/merge: git-merge knows some strategies want to skip trivial merges
No changes.