diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:49:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 13:49:45 -0700 |
| commit | c752e7f3e8d96a9673ad248addc9418164bd3ce6 (patch) | |
| tree | 812bbca3530914a49161074d1aa1f4f051737c09 /Documentation/git-mergetool--lib.txt | |
| parent | 8520913cc53e03dcc4b4395cdf500ab8e60ed792 (diff) | |
| parent | 7c6eafa35af805578990e76b691ff7f1a25a3c57 (diff) | |
| download | git-c752e7f3e8d96a9673ad248addc9418164bd3ce6.tar.gz | |
Merge branch 'maint'
* maint:
t/t3415: use && where applicable.
SubmittingPatches: Document some extra tags used in commit messages
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions