Merge branch 'maint'

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index c17d9dcc74e02eb9f7bfc743df85e1e99ae6bd77..1e192a2207a4b56d477e8e3efc382c3a296ba776 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -143,6 +143,8 @@ cat > test/expect << EOF
   URL: $(pwd)/one/.git
   Remote branch merged with 'git pull' while on branch master
     master
+  Tracked remote branches
+    master side
   Local branches pushed with 'git push'
     master:upstream +refs/tags/lastbackup
 EOF