summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2009-05-17 11:43:08 +0900
committerJunio C Hamano <gitster@pobox.com>2009-05-16 19:49:25 -0700
commite4b09dad9f65395fd4bb8ab165012a3a6698a75b (patch)
treeb1be4be8236768e952f47773f3719f6df0d9402e /builtin-merge-ours.c
parentdd42c2f015102626562da05bb290f47862ea06fb (diff)
downloadgit-e4b09dad9f65395fd4bb8ab165012a3a6698a75b.tar.gz
test: checkout shouldn't say that HEAD has moved if it didn't
Signed-off-by: しらいしななこ <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions