summaryrefslogtreecommitdiff
path: root/git.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2014-05-31 16:47:35 +0200
committerCarlos Martín Nieto <[email protected]>2014-05-31 16:47:35 +0200
commit7906bdbdceddff34827ba13640b6d03bc813139f (patch)
treeefab136c622306aff0f2a771beb8f28671d9fa76 /git.go
parent8a73c75f1a68f2855d03e6d2ce45c95c414aa71a (diff)
Merge: merge analysis now returns the user's preference
Diffstat (limited to 'git.go')
0 files changed, 0 insertions, 0 deletions