summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Eric S. Raymond <esr@thyrsus.com>2012-11-04 23:31:01 -0500
committerLibravatar Jeff King <peff@peff.net>2012-11-08 14:11:53 -0500
commite70528862f0f67fdb6bd67d8819d5b01156eacdc (patch)
tree4ee375bcf70c14bef5bbfec6f9489817662ed7ea /builtin/merge-ours.c
parentGit 1.7.12.4 (diff)
downloadtgif-e70528862f0f67fdb6bd67d8819d5b01156eacdc.tar.xz
doc/fast-import: clarify how content states are built
Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions