summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-30 14:58:16 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-30 14:58:16 -0700
commit9768cafe681a7844d5a1d067991053b25db83bbb (patch)
tree63c5c2aa6640d03d3db627166d4a3956f2dadb32 /ll-merge.c
parent1692579dd3569ebc01187872db91ee2ad93cc962 (diff)
parent00855b656bf883c607a4adcd5bc7a76711e4b3a3 (diff)
downloadgit-9768cafe681a7844d5a1d067991053b25db83bbb.tar.gz
Merge branch 'ld/git-p4-tags-and-labels'
By Luke Diamand * ld/git-p4-tags-and-labels: git p4: fix unit tests git p4: move verbose to base class git p4: Ignore P4EDITOR if it is empty git p4: Squash P4EDITOR in test harness git p4: fix-up "import/export of labels to/from p4" git p4: import/export of labels to/from p4 git p4: Fixing script editor checks
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions