diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-16 08:03:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-16 08:03:16 (GMT) |
| commit | 1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3 (patch) | |
| tree | 297e91429f4c03aea386016640dc4d1da06b323e /Documentation/git-mergetool.txt | |
| parent | f4198c9b7d319a7a595f0d759e7d8094387ab77b (diff) | |
| parent | 81d66500c1e47d19c18d643ef074e0475dc90eb1 (diff) | |
| download | git-1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3.zip git-1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3.tar.gz git-1eaa541f5fbda3fc30085da4f75e99dfae4ec9b3.tar.bz2 | |
Merge branch 'maint'
* maint:
Start draft ReleaseNotes for 1.5.4.5
rebase -m: do not trigger pre-commit verification
Conflicts:
RelNotes
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions