| commit | 0eea345111a9b9fea4dd2841b80bc7d62964e812 | |
| author | Charles Bailey <charles@hashpling.org> | |
| Thu, 13 Nov 2008 12:41:13 +0000 (13 12:41 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 15 Nov 2008 05:30:55 +0000 (14 21:30 -0800) | ||
| tree | 122d60f06a56c7eb16bc8242773bf61e691c778f | treesnapshot (tar.gz zip) |
| parent | a0d3ab9c277f1a198ec8e29432c0127d4cf719d2 | commitdiff |
Fix some tab/space inconsistencies in git-mergetool.sh
git-mergetool.sh mostly uses 8 space tabs and 4 spaces per indent. This
change corrects this in a part of the file affect by a later commit in
this patch series. diff -w considers this change is to be a null change.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh mostly uses 8 space tabs and 4 spaces per indent. This
change corrects this in a part of the file affect by a later commit in
this patch series. diff -w considers this change is to be a null change.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory |