summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-10-13 04:38:01 -0500
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-03-27 23:02:05 -0500
commitef2ac77e9f8f4819f75cf52721567463e60a805c (patch)
treeb6abe02d4b4abd394106940dafcf9049af4c0317 /contrib/examples/git-merge.sh
parentvcs-svn: read inline data from deltas (diff)
downloadtgif-ef2ac77e9f8f4819f75cf52721567463e60a805c.tar.xz
vcs-svn: read instructions from deltas
Buffer the instruction section upon encountering it for later interpretation. An alternative design would involve parsing the instructions at this point and buffering them in some processed form. Using the unprocessed form is simpler. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Ramkumar Ramachandra <artagnon@gmail.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions