diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:59:30 -0700 |
commit | b2f6eab4027beaaa7415e70dad269bdc7cc27722 (patch) | |
tree | 2e6088ca17b4042ccf9c658148cd5af55021c8a1 /git-gui/lib/merge.tcl | |
parent | vcs-svn: remove spurious semicolons (diff) | |
parent | Prepare draft release notes to 1.7.4.2 (diff) | |
download | tgif-b2f6eab4027beaaa7415e70dad269bdc7cc27722.tar.xz |
Merge branch 'maint'
* maint:
Prepare draft release notes to 1.7.4.2
gitweb: highlight: replace tabs with spaces
make_absolute_path: return the input path if it points to our buffer
valgrind: ignore SSE-based strlen invalid reads
diff --submodule: split into bite-sized pieces
cherry: split off function to print output lines
branch: split off function that writes tracking info and commit subject
standardize brace placement in struct definitions
compat: make gcc bswap an inline function
enums: omit trailing comma for portability
Conflicts:
RelNotes
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions