summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-22 06:26:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-22 06:26:46 (GMT)
commit2eb54692d145a0c2939698302e913975f059ac34 (patch)
tree88911c7cd362f52770bded7c03b73f32a7d8abb7 /git-pull.sh
parenta0b6a9d2b2b0667bc170c864a05b3ec4635a71bb (diff)
parente935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (diff)
downloadgit-2eb54692d145a0c2939698302e913975f059ac34.zip
git-2eb54692d145a0c2939698302e913975f059ac34.tar.gz
git-2eb54692d145a0c2939698302e913975f059ac34.tar.bz2
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages: t7609: test merge and checkout error messages unpack_trees: group error messages by type merge-recursive: distinguish "removed" and "overwritten" messages merge-recursive: porcelain messages for checkout Turn unpack_trees_options.msgs into an array + enum Conflicts: t/t3400-rebase.sh
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions