diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:00 -0700 |
| commit | 9fdc1cc872308869d76665be55367eef48f05ff6 (patch) | |
| tree | c8d6a72151878f81e001775dbd383584f059b4ce /git-gui/lib/mergetool.tcl | |
| parent | 76f4f74a444cdb3d43950c099da60e5d1ad36305 (diff) | |
| parent | c192f9c865dbdae48c0400d717581d34cd315fb8 (diff) | |
| download | git-9fdc1cc872308869d76665be55367eef48f05ff6.tar.gz | |
Merge branch 'aw/maint-rebase-i-p-no-ff'
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Conflicts:
git-rebase--interactive.sh
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions