| commit | 692c7fc9cb81a2f68b23199d5b8612494fe4d317 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Mar 2006 08:22:48 +0000 (26 00:22 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Mar 2006 08:22:48 +0000 (26 00:22 -0800) | ||
| tree | a0276f87f0e29ca932f71119cc7ffb72fb210fbd | treesnapshot (tar.gz zip) |
| parent | 9086a18cb81f99fff943b36830396ac8c37c7e9f | commitdiff |
| parent | 6ea23343ce2962a5c76ed62a29fd17cb30954de2 | commitdiff |
Merge branch 'jc/merge'
* jc/merge:
git-merge knows some strategies want to skip trivial merges
* jc/merge:
git-merge knows some strategies want to skip trivial merges