summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-04 00:25:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-05 10:52:56 -0800
commite72c74062c01855372add133fe8dcc0bd22bad20 (patch)
tree5df5bd3e62702294182908d81c5eb6d9a274f6f5 /builtin-merge-ours.c
parentam: read from the right mailbox when started from a subdirectory (diff)
downloadtgif-e72c74062c01855372add133fe8dcc0bd22bad20.tar.xz
am: remove support for -d .dotest
It has been supported for a long time, but I do not think this feature has been in use in the real world at all. We would eventually move this out of the toplevel of the work tree and to somewhere under $GIT_DIR, so let's remove the command line option to specify the location now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions