diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-08-15 10:01:58 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-08-15 10:01:58 +0000 |
| commit | ab87b34d4ef6e591e986dcfec47dfffec93c1acc (patch) | |
| tree | 71db9e9b9cbda8ffda6c9a765d4ac9ab97b5e86f /Tools | |
| parent | 573bad08c5c2e684bae93699e959f5a718563e46 (diff) | |
| download | ports-ab87b34d4ef6e591e986dcfec47dfffec93c1acc.tar.gz ports-ab87b34d4ef6e591e986dcfec47dfffec93c1acc.zip | |
Echo where the merge was done, so one can go and have a look.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=420223
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/scripts/mfh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/scripts/mfh b/Tools/scripts/mfh index fbd11139a15a..a8b4cc323beb 100755 --- a/Tools/scripts/mfh +++ b/Tools/scripts/mfh @@ -117,6 +117,7 @@ done "${svn}" up --quiet "${branch}" "${svn}" status "${branch}" "${svn}" diff "${branch}" +echo "All the merge work was done in ${dir}/${branch}." ask "Do you want to commit? (no = start a shell)" || ( echo "Dropping you to a shell so you can investigate. Exit the shell to resume this script." cd "${branch}" |