diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:02 -0800 |
| commit | 556c5e030f17efb412a192a430fe9027840ed718 (patch) | |
| tree | 1600c629829c2b1f029af13da527c3380b25c5e7 /builtin/merge.c | |
| parent | 85551232b56e763ecfcc7222e0858bac4e962c80 (diff) | |
| parent | 0dbe6592ccbd1a394a69a52074e3729d546fe952 (diff) | |
| download | git-556c5e030f17efb412a192a430fe9027840ed718.tar.gz git-556c5e030f17efb412a192a430fe9027840ed718.tar.xz | |
Merge branch 'maint'
By Thomas Rast
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions