diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-26 00:22:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-26 00:22:48 -0800 |
| commit | 692c7fc9cb81a2f68b23199d5b8612494fe4d317 (patch) | |
| tree | a0276f87f0e29ca932f71119cc7ffb72fb210fbd /diff.c | |
| parent | 9086a18cb81f99fff943b36830396ac8c37c7e9f (diff) | |
| parent | 6ea23343ce2962a5c76ed62a29fd17cb30954de2 (diff) | |
| download | git-692c7fc9cb81a2f68b23199d5b8612494fe4d317.tar.gz | |
Merge branch 'jc/merge'
* jc/merge:
git-merge knows some strategies want to skip trivial merges
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions