diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:15:09 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:15:09 +0900 |
| commit | 0c24fdc2562be87c9f57fc224e634566c9454a15 (patch) | |
| tree | b4a98d6daecbdeccf69dcdf68603a70d893b0d39 /git-gui/lib/merge.tcl | |
| parent | c2b6135a1b52a567c92286bb1d3345b6cb0db584 (diff) | |
| parent | 7bc77766e127d94afe67a3fd900105514b6659dd (diff) | |
| download | git-0c24fdc2562be87c9f57fc224e634566c9454a15.tar.gz git-0c24fdc2562be87c9f57fc224e634566c9454a15.tar.xz | |
Sync with maint
* maint:
A bit more fixes for 2.15.1
RelNotes: minor typo fixes in 2.15.1 draft
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions