summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2014-12-03 19:01:33 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-04 15:27:47 -0800
commit1f23cfe0ef5b2634a7b911a8b6dc4eff7f78ba5d (patch)
tree80030bcb1a5429675d8a424fdbe3e749325e051f /Documentation/technical/trivial-merge.txt
parentb260d265e189728b26e50506ac6ffab6a7d588da (diff)
downloadgit-1f23cfe0ef5b2634a7b911a8b6dc4eff7f78ba5d.tar.gz
doc: document error handling functions and conventions
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions