Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: Explain git-mergetool's use of temporary files
author
David Aguilar
<davvid@gmail.com>
Sun, 18 Jul 2010 01:46:48 +0000
(18:46 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 19 Jul 2010 16:16:09 +0000
(09:16 -0700)
'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>
raw
|
patch
|
inline
| side by side (from:
d1cc462
)
No differences found