diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 11:16:51 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 16:20:01 (GMT) |
commit | 24d113ec11d9948cedee4ba4687d0775e36b65f9 (patch) | |
tree | c33ca269e8ada4ffce288957e8647fc2eda7c867 /Documentation/merge-config.txt | |
parent | 1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4 (diff) | |
download | git-24d113ec11d9948cedee4ba4687d0775e36b65f9.zip git-24d113ec11d9948cedee4ba4687d0775e36b65f9.tar.gz git-24d113ec11d9948cedee4ba4687d0775e36b65f9.tar.bz2 |
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 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions