summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorKarsten Blees <karsten.blees@gmail.com>2014-07-12 02:04:29 +0200
committerJunio C Hamano <gitster@pobox.com>2014-07-13 21:25:19 -0700
commit66f66c596fa2b4e7d4c00575a5731d33ab28d4ed (patch)
tree4819b72e374af4713bdc1577c8213f1dc743bc24 /merge.c
parentb72be02cfb402bbd6abac07af7231613cd37d594 (diff)
downloadgit-66f66c596fa2b4e7d4c00575a5731d33ab28d4ed.tar.gz
trace: move code around, in preparation to file:line output
No functional changes, just move stuff around so that the next patch isn't that ugly... Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions