diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:16:51 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:01 -0700 |
| commit | 24d113ec11d9948cedee4ba4687d0775e36b65f9 (patch) | |
| tree | c33ca269e8ada4ffce288957e8647fc2eda7c867 /t/t4040-whitespace-status.sh | |
| parent | merge-trees: let caller decide whether to renormalize (diff) | |
| download | tgif-24d113ec11d9948cedee4ba4687d0775e36b65f9.tar.xz | |
Documentation/technical: document ll_merge
Cc: Junio C Hamano <gitster@pobox.com>
Cc: Avery Pennarun <apenwarr@gmail.com>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4040-whitespace-status.sh')
0 files changed, 0 insertions, 0 deletions