summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-05-13 00:14:40 -0400
committerLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-05-17 21:08:02 -0400
commit82c8bf28f8e4b5d2c647289abccb69b5fe69d3b1 (patch)
tree5e236a2702e3302bcb74fe06fa0f083272c5dc56 /git-merge-ours.sh
parentDocumentation: remove howto's now incorporated into manual (diff)
downloadtgif-82c8bf28f8e4b5d2c647289abccb69b5fe69d3b1.tar.xz
user-manual: move howto/make-dist.txt into user manual
There seems to be a perception that the howto's are bit-rotting a little. The manual might be a more visible location for some of them, and make-dist.txt seems like a good candidate to include as an example in the manual. For now, incorporate much of it verbatim. Later we may want to update the example a bit. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions