| commit | 03e904cbd600afee7a39160aabc79a628916eecc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Aug 2018 18:33:51 +0000 (20 11:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Aug 2018 18:33:51 +0000 (20 11:33 -0700) | ||
| tree | 734726ee404a43bebb97e6a036b5ed8a60d7fe5f | treesnapshot (tar.gz zip) |
| parent | 3bc484af74132332f5bb69401f223e2fe11bfa39 | commitdiff |
| parent | d651a54b8a22a307f5b061ba50c5348ae31e861c | commitdiff |
Merge branch 'ng/mergetool-lose-final-prompt'
"git mergetool" stopped and gave an extra prompt to continue after
the last path has been handled, which did not make much sense.
* ng/mergetool-lose-final-prompt:
mergetool: don't suggest to continue after last file
"git mergetool" stopped and gave an extra prompt to continue after
the last path has been handled, which did not make much sense.
* ng/mergetool-lose-final-prompt:
mergetool: don't suggest to continue after last file