diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 14:08:27 -0800 |
| commit | ee8d52f83985ba897dab2829823fbcfe40083cf6 (patch) | |
| tree | e1fa156f8f4a80eca16443857d17bebacaaaab92 /builtin/merge.c | |
| parent | 3d8bc74127bbb583bc437214a1d6c9afcf77646c (diff) | |
| parent | 701825de23da2bff6c784d33ff27f75e802abd81 (diff) | |
Merge branch 'js/add-e-submodule-fix'
* js/add-e-submodule-fix:
add -e: do not show difference in a submodule that is merely dirty
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions