diff options
| author | David Aguilar <davvid@gmail.com> | 2010-07-17 18:46:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 09:16:09 -0700 |
| commit | d1cc4621eda62222fbc929a7f65c89b6be678c2e (patch) | |
| tree | 59bb12689639adc5d3b15b0c12ad39dd0d3ad7d7 /ll-merge.h | |
| parent | 0ad0a61f05fe521a63ade9bfafd2f589fba0df33 (diff) | |
| download | git-d1cc4621eda62222fbc929a7f65c89b6be678c2e.tar.gz git-d1cc4621eda62222fbc929a7f65c89b6be678c2e.tar.xz | |
Documentation: Explain git-mergetool's use of temporary files
'git mergetool' creates '*.orig' backup files in its
default configuration. Mention this in its documentation.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions