diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-16 15:08:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-16 15:08:46 -0800 |
| commit | 53756f290b94a0f8ee7021713fa63540d1a7e4e8 (patch) | |
| tree | 53ba4f90775e57fc7d0eec6d3ef2fbb4dcb7b393 /diff-lib.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-merge: minor fix for no_trivial_merge_strategies. (diff) | |
| download | git-53756f290b94a0f8ee7021713fa63540d1a7e4e8.tar.gz git-53756f290b94a0f8ee7021713fa63540d1a7e4e8.zip | |
Merge branch 'maint'
* maint:
git-merge: minor fix for no_trivial_merge_strategies.
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions