summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar David Kågedal <davidk@lysator.liu.se>2009-08-26 16:04:54 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-26 12:05:58 -0700
commit8d9518439595c9d2c601e841a6792d9ee30f9293 (patch)
treeab42a32a657cd5954a5fa86ff07085efc32c1f63 /Documentation/merge-strategies.txt
parentgit-bisect: call the found commit "*the* first bad commit" (diff)
downloadtgif-8d9518439595c9d2c601e841a6792d9ee30f9293.tar.xz
Minor improvement to the write-tree documentation
Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions