diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 23:00:52 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 23:00:52 -0800 |
commit | 91c23f76cec4a4ec9b9143b7ebb31e639856ed16 (patch) | |
tree | bfa69694a4d80b1a17a8af0b917f3a9df272ebe5 /mergetools/p4merge | |
parent | Merge branch 'tr/userdiff-c-returns-pointer' (diff) | |
parent | diff/status: print submodule path when looking for changes fails (diff) | |
download | tgif-91c23f76cec4a4ec9b9143b7ebb31e639856ed16.tar.xz |
Merge branch 'jl/submodule-status-failure-report'
* jl/submodule-status-failure-report:
diff/status: print submodule path when looking for changes fails
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions