diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 07:11:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 07:11:59 (GMT) |
| commit | af24059fa299f1656692f5807eddd3b30b5f3cfb (patch) | |
| tree | c5e12eb4c91edd04e9c8fea6408678c5660946e4 /Documentation/git-mergetool--lib.txt | |
| parent | dd34b6be8a3e869f3e0d62a13115f02d90cf4f80 (diff) | |
| parent | d2c030d4773f1f00165bffc34e2487043df326e7 (diff) | |
| download | git-af24059fa299f1656692f5807eddd3b30b5f3cfb.zip git-af24059fa299f1656692f5807eddd3b30b5f3cfb.tar.gz git-af24059fa299f1656692f5807eddd3b30b5f3cfb.tar.bz2 | |
Merge branch 'xx/trivial' into maint
* xx/trivial:
tag.c: whitespace breakages fix
Fix whitespace issue in object.c
t5505: add missing &&
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions