summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:38:32 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-25 12:19:28 -0700
commita55ce971857c5fcaf9d390c826de6a0e5c6a74eb (patch)
treea6e1e72030f0b8466e605fc7c9f324fb954d1382 /git-merge-resolve.sh
parentregister_ref(): rewrite to take an object_id argument (diff)
downloadtgif-a55ce971857c5fcaf9d390c826de6a0e5c6a74eb.tar.xz
append_ref(): rewrite to take an object_id argument
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions