summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-08 21:27:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-08 21:27:19 -0700
commita944af1d86e6171d68ed2a3aa67b1d68f00e1fe8 (patch)
tree7f351a1a1d9d7f01cc7195a527eab88417789417 /builtin.h
parentGit 1.7.9.7 (diff)
downloadtgif-a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8.tar.xz
merge: teach -Xours/-Xtheirs to binary ll-merge driver
The (discouraged) -Xours/-Xtheirs modes of merge are supposed to give a quick and dirty way to come up with a random mixture of cleanly merged parts and punted conflict resolution to take contents from one side in conflicting parts. These options however were only passed down to the low level merge driver for text. Teach the built-in binary merge driver to notice them as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions