tests/test-merge-symlinks.hg

subrepos: print short git changeset ids

This changes the prompts on git subrepos to show only the first seven
digits of git changeset IDs (as git's command line does):

    $ hg update
    subrepository sources for s differ (in checked out version)
    use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?

(binary:application/octet-stream)