summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-08-01 11:57:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-01 11:57:25 -0700
commitbaa2e936990a9bce84fdb8bcffbd940f05800241 (patch)
treea2b6a983c208ce4a30df8db1276928e7670edeac /git-merge-one-file.sh
parentMerge branch 'lf/echo-n-is-not-portable' (diff)
parentbuiltin/rm.c: consolidate error reporting for removing submodules (diff)
downloadtgif-baa2e936990a9bce84fdb8bcffbd940f05800241.tar.xz
Merge branch 'jc/rm-submodule-error-message'
Consolidate two messages phrased subtly differently without a good reason. * jc/rm-submodule-error-message: builtin/rm.c: consolidate error reporting for removing submodules
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions