summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-05 11:28:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-06 16:20:02 (GMT)
commit672d1b789bc041be6aa18dcce066e6b556d6b787 (patch)
tree3101a8c8f1ce6ca1d4423df70ba3930222c3ad3d /builtin/merge-recursive.c
parentf7314882c26b34c4c1039b65b1c8e6b380d30674 (diff)
downloadgit-672d1b789bc041be6aa18dcce066e6b556d6b787.zip
git-672d1b789bc041be6aa18dcce066e6b556d6b787.tar.gz
git-672d1b789bc041be6aa18dcce066e6b556d6b787.tar.bz2
rerere: migrate to parse-options API
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions