diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:05 -0700 |
| commit | 7fd4181c661260f10bf8cb3e80489c230205d774 (patch) | |
| tree | 9a90aa5e998b4c572a7340a2c949c9be3bb6a03a /git-gui/lib/merge.tcl | |
| parent | 0692a6c22c37e07ef07a3d2c5d39deaaa3c26ffe (diff) | |
| parent | b2af4829cc51fc90885948f19f24b76f2670a677 (diff) | |
| download | git-7fd4181c661260f10bf8cb3e80489c230205d774.tar.gz git-7fd4181c661260f10bf8cb3e80489c230205d774.tar.xz | |
Merge branch 'xf/user-manual-ff'
* xf/user-manual-ff:
user-manual: fix the description of fast-forward
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions