summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-01-02 21:09:38 -0600
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-02-26 04:59:37 -0600
commitcb3f87cf1ba90373fdc240d65a4d65434099d9a3 (patch)
treeea9094dc1cf3c5f96df6d6fe56dee306aaddac5f /builtin/merge-index.c
parentvcs-svn: allow character-oriented input (diff)
downloadtgif-cb3f87cf1ba90373fdc240d65a4d65434099d9a3.tar.xz
vcs-svn: allow input from file descriptor
Based-on-patch-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions