aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-20 21:40:45 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-20 23:45:51 -0700
commitd4900ee48c70114ea3227f922d383de6b273fcde (patch)
treef8d02a55a6a07702696d724da486431f08d6cd55 /merge-recursive.h
parentccf497de97f9d22e55e9e5ae90b8a65503d48099 (diff)
downloadgit-d4900ee48c70114ea3227f922d383de6b273fcde.tar.gz
git-d4900ee48c70114ea3227f922d383de6b273fcde.tar.xz
git-show-ref.txt: remove word and make consistent
Under is better than in because of the nested nature of the .git directory. "also using" sounds a little odd, plus we say combined with later on so just use that. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions