summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Nanako Shiraishi <nanako3@lavabit.com>2009-08-26 17:38:50 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-26 12:05:57 -0700
commit21d0bc2f9a5bcbee2593e9f2ad05d64d3dcf3a0e (patch)
treec74e41b3cc9435fee0ddd7edd357b731a0dd6fe2 /Documentation/merge-strategies.txt
parentMerge branch 'js/maint-cover-letter-non-ascii' into maint (diff)
downloadtgif-21d0bc2f9a5bcbee2593e9f2ad05d64d3dcf3a0e.tar.xz
git-bisect: call the found commit "*the* first bad commit"
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions